projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
[powerpc.git]
/
include
/
asm-s390
/
setup.h
diff --git
a/include/asm-s390/setup.h
b/include/asm-s390/setup.h
index
348a881
..
da3fd4a
100644
(file)
--- a/
include/asm-s390/setup.h
+++ b/
include/asm-s390/setup.h
@@
-8,6
+8,8
@@
#ifndef _ASM_S390_SETUP_H
#define _ASM_S390_SETUP_H
#ifndef _ASM_S390_SETUP_H
#define _ASM_S390_SETUP_H
+#ifdef __KERNEL__
+
#include <asm/types.h>
#define PARMAREA 0x10400
#include <asm/types.h>
#define PARMAREA 0x10400
@@
-114,7
+116,7
@@
extern u16 ipl_devno;
IPL_PARMBLOCK_ORIGIN)
#define IPL_PARMBLOCK_SIZE (IPL_PARMBLOCK_START->hdr.length)
IPL_PARMBLOCK_ORIGIN)
#define IPL_PARMBLOCK_SIZE (IPL_PARMBLOCK_START->hdr.length)
-#else
+#else
/* __ASSEMBLY__ */
#ifndef __s390x__
#define IPL_DEVICE 0x10404
#ifndef __s390x__
#define IPL_DEVICE 0x10404
@@
-127,6
+129,6
@@
extern u16 ipl_devno;
#endif /* __s390x__ */
#define COMMAND_LINE 0x10480
#endif /* __s390x__ */
#define COMMAND_LINE 0x10480
-#endif
-
-#endif
+#endif
/* __ASSEMBLY__ */
+#endif /* __KERNEL__ */
+#endif
/* _ASM_S390_SETUP_H */