diff options
| author | Andrew Morton <akpm@linux-foundation.org> | 2010-02-02 14:43:10 -0800 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2010-02-25 12:51:41 +0000 |
| commit | 91f8026603d4443d1b24ee3552c5a58682bbae27 (patch) | |
| tree | 9cf7e1fdec04ce613466aca92dce661e1ae23a37 /include/linux/jffs2.h | |
| parent | 9a5dea7b1046510fdcc81c523405494fd07ec303 (diff) | |
JFFS2: avoid using C++ keyword `new' in userspace-visible header
Addresses http://bugzilla.kernel.org/show_bug.cgi?id=14995
Reported-by: R. Diez <rdiezmail-kernelbugzilla@yahoo.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Diffstat (limited to 'include/linux/jffs2.h')
| -rw-r--r-- | include/linux/jffs2.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/jffs2.h b/include/linux/jffs2.h index 2b32d638147d..0874ab59ffef 100644 --- a/include/linux/jffs2.h +++ b/include/linux/jffs2.h @@ -215,8 +215,8 @@ union jffs2_node_union /* Data payload for device nodes. */ union jffs2_device_node { - jint16_t old; - jint32_t new; + jint16_t old_id; + jint32_t new_id; }; #endif /* __LINUX_JFFS2_H__ */ |