From c2b6ebd50be76879261b67fc5fd29608b82ae443 Mon Sep 17 00:00:00 2001 From: Helge Deller Date: Mon, 28 May 2007 18:01:39 +0200 Subject: [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 Signed-off-by: Kyle McMartin --- include/asm-parisc/linkage.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'include/asm-parisc') diff --git a/include/asm-parisc/linkage.h b/include/asm-parisc/linkage.h index 7a09d911b53..cdb470921ac 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 */ -- cgit v1.2.3