diff options
| author | David Howells | 2012-10-09 10:47:31 +0200 |
|---|---|---|
| committer | David Howells | 2012-10-09 10:47:31 +0200 |
| commit | 9807f75955ea7f1877981056755284481873115c (patch) | |
| tree | 1e80f10ee622a1638d4b0835030d0d69b0492c55 /arch/s390/include/asm/setup.h | |
| parent | Merge branch 'akpm' (Andrew's patch-bomb) (diff) | |
| download | kernel-qcow2-linux-9807f75955ea7f1877981056755284481873115c.tar.gz kernel-qcow2-linux-9807f75955ea7f1877981056755284481873115c.tar.xz kernel-qcow2-linux-9807f75955ea7f1877981056755284481873115c.zip | |
UAPI: (Scripted) Disintegrate arch/s390/include/asm
Signed-off-by: David Howells <dhowells@redhat.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Michael Kerrisk <mtk.manpages@gmail.com>
Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Acked-by: Dave Jones <davej@redhat.com>
Diffstat (limited to 'arch/s390/include/asm/setup.h')
| -rw-r--r-- | arch/s390/include/asm/setup.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/arch/s390/include/asm/setup.h b/arch/s390/include/asm/setup.h index 8cfd731a18d8..55ad134bcedf 100644 --- a/arch/s390/include/asm/setup.h +++ b/arch/s390/include/asm/setup.h @@ -2,15 +2,11 @@ * S390 version * Copyright IBM Corp. 1999, 2010 */ - #ifndef _ASM_S390_SETUP_H #define _ASM_S390_SETUP_H -#define COMMAND_LINE_SIZE 4096 - -#define ARCH_COMMAND_LINE_SIZE 896 +#include <uapi/asm/setup.h> -#ifdef __KERNEL__ #define PARMAREA 0x10400 #define MEMORY_CHUNKS 256 @@ -173,5 +169,4 @@ extern void (*_machine_power_off)(void); #define COMMAND_LINE 0x10480 #endif /* __ASSEMBLY__ */ -#endif /* __KERNEL__ */ #endif /* _ASM_S390_SETUP_H */ |