Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=c2b6ebd50be76879261b67fc5fd29608b82ae443
Commit: c2b6ebd50be76879261b67fc5fd29608b82ae443
Parent: 593af52aa63193ac331cc13bca2b5611b74ddf77
Author: Helge Deller <[EMAIL PROTECTED]>
AuthorDate: Mon May 28 18:01:39 2007 +0200
Committer: Kyle McMartin <[EMAIL PROTECTED]>
CommitDate: Wed May 30 02:10:06 2007 -0400
[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 <[EMAIL PROTECTED]>
Signed-off-by: Kyle McMartin <[EMAIL PROTECTED]>
---
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 7a09d91..cdb4709 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 */
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
