projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/cooloney...
[powerpc.git]
/
include
/
asm-m32r
/
setup.h
diff --git
a/include/asm-m32r/setup.h
b/include/asm-m32r/setup.h
index
6a0b322
..
c637ab9
100644
(file)
--- a/
include/asm-m32r/setup.h
+++ b/
include/asm-m32r/setup.h
@@
-1,3
+1,6
@@
+#ifndef _ASM_M32R_SETUP_H
+#define _ASM_M32R_SETUP_H
+
/*
* This is set up by the setup-routine at boot-time
*/
@@
-32,3
+35,4
@@
extern unsigned long memory_end;
#endif /* __KERNEL__ */
+#endif /* _ASM_M32R_SETUP_H */