git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
kbuild: Don't define ALIGN and ENTRY when preprocessing linker scripts.
[pandora-kernel.git]
/
include
/
linux
/
linkage.h
diff --git
a/include/linux/linkage.h
b/include/linux/linkage.h
index
691f591
..
5126cce
100644
(file)
--- a/
include/linux/linkage.h
+++ b/
include/linux/linkage.h
@@
-57,6
+57,7
@@
#ifdef __ASSEMBLY__
+#ifndef LINKER_SCRIPT
#define ALIGN __ALIGN
#define ALIGN_STR __ALIGN_STR
@@
-66,6
+67,7
@@
ALIGN; \
name:
#endif
+#endif /* LINKER_SCRIPT */
#ifndef WEAK
#define WEAK(name) \