]> err.no Git - linux-2.6/commitdiff
[PARISC] fix "ENTRY" macro redefinition
authorHelge Deller <deller@gmx.de>
Mon, 28 May 2007 16:01:39 +0000 (18:01 +0200)
committerKyle McMartin <kyle@minerva.i.cabal.ca>
Wed, 30 May 2007 06:10:06 +0000 (02:10 -0400)
Thanks to James for noticing.

It fixes:
fs/ext3/xattr.c:65:1: warning: "ENTRY" redefined
In file included from include/linux/linkage.h:4,
                 from include/linux/fs.h:271,
                 from fs/ext3/xattr.c:54:
include/asm/linkage.h:13:1: warning: this is the location of the previous definition

Signed-off-by: Helge Deller <deller@gmx.de>
Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
include/asm-parisc/linkage.h

index 7a09d911b53895eb5976ab96fd62d53989018d11..cdb470921ace299823c52470f5aa38acb05d5563 100644 (file)
@@ -10,6 +10,8 @@
  * In parisc assembly a semicolon marks a comment while a
  * exclamation mark is used to seperate independend lines.
  */
+#ifdef __ASSEMBLY__
+
 #define ENTRY(name) \
        .export name !\
        ALIGN !\
@@ -24,5 +26,6 @@ name:
        END(name)
 #endif
 
+#endif /* __ASSEMBLY__ */
 
 #endif  /* __ASM_PARISC_LINKAGE_H */