diff options
| author | Helge Deller <deller@gmx.de> | 2007-05-28 18:01:39 +0200 |
|---|---|---|
| committer | Kyle McMartin <kyle@minerva.i.cabal.ca> | 2007-05-30 02:10:06 -0400 |
| commit | c2b6ebd50be76879261b67fc5fd29608b82ae443 (patch) | |
| tree | bfa2583c1e109ea2f23877e365f4da7158168a8b /include | |
| parent | 593af52aa63193ac331cc13bca2b5611b74ddf77 (diff) | |
| download | linux-stable-c2b6ebd50be76879261b67fc5fd29608b82ae443.tar.gz linux-stable-c2b6ebd50be76879261b67fc5fd29608b82ae443.tar.bz2 linux-stable-c2b6ebd50be76879261b67fc5fd29608b82ae443.zip | |
[PARISC] fix "ENTRY" macro redefinition
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>
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-parisc/linkage.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/asm-parisc/linkage.h b/include/asm-parisc/linkage.h index 7a09d911b538..cdb470921ace 100644 --- a/include/asm-parisc/linkage.h +++ b/include/asm-parisc/linkage.h @@ -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 */ |