diff options
| author | David Howells <dhowells@redhat.com> | 2012-12-14 22:37:13 +0000 |
|---|---|---|
| committer | David Howells <dhowells@redhat.com> | 2012-12-14 22:37:13 +0000 |
| commit | af170c5061dd78512c469e6e2d211980cdb2c193 (patch) | |
| tree | a3bb86ee66b69f832b6783124cc0482ce8058cd8 /arch/x86/include/asm/setup.h | |
| parent | d42b3a2906a10b732ea7d7f849d49be79d242ef0 (diff) | |
| download | linux-af170c5061dd78512c469e6e2d211980cdb2c193.tar.bz2 | |
UAPI: (Scripted) Disintegrate arch/x86/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/x86/include/asm/setup.h')
| -rw-r--r-- | arch/x86/include/asm/setup.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/x86/include/asm/setup.h b/arch/x86/include/asm/setup.h index d0f19f9fb846..b7bf3505e1ec 100644 --- a/arch/x86/include/asm/setup.h +++ b/arch/x86/include/asm/setup.h @@ -1,7 +1,8 @@ #ifndef _ASM_X86_SETUP_H #define _ASM_X86_SETUP_H -#ifdef __KERNEL__ +#include <uapi/asm/setup.h> + #define COMMAND_LINE_SIZE 2048 @@ -123,6 +124,4 @@ void __init x86_64_start_reservations(char *real_mode_data); .size .brk.name,.-1b; \ .popsection #endif /* __ASSEMBLY__ */ -#endif /* __KERNEL__ */ - #endif /* _ASM_X86_SETUP_H */ |