diff options
| author | David Howells <dhowells@redhat.com> | 2012-10-10 13:34:29 +0200 |
|---|---|---|
| committer | David Howells <dhowells@redhat.com> | 2012-10-10 13:34:29 +0200 |
| commit | dc44ce1e1e157ea0a8b256f42aa0425300a0435e (patch) | |
| tree | fb178ff04e305853b36dcb2dda74d7ddece6c703 /arch/frv/include/asm/setup.h | |
| parent | UAPI: (Scripted) Disintegrate arch/mn10300/include/asm (diff) | |
| parent | UAPI: (Scripted) Disintegrate arch/frv/include/asm (diff) | |
| download | linux-dc44ce1e1e157ea0a8b256f42aa0425300a0435e.tar.xz linux-dc44ce1e1e157ea0a8b256f42aa0425300a0435e.zip | |
Merge branch 'disintegrate-frv' into disintegrate-misc-arches
Signed-off-by: David Howells <dhowells@redhat.com>
Diffstat (limited to 'arch/frv/include/asm/setup.h')
| -rw-r--r-- | arch/frv/include/asm/setup.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/arch/frv/include/asm/setup.h b/arch/frv/include/asm/setup.h index afd787ceede6..aa76f2eac09a 100644 --- a/arch/frv/include/asm/setup.h +++ b/arch/frv/include/asm/setup.h @@ -8,15 +8,12 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. */ - #ifndef _ASM_SETUP_H #define _ASM_SETUP_H -#define COMMAND_LINE_SIZE 512 - -#ifdef __KERNEL__ #include <linux/init.h> +#include <uapi/asm/setup.h> #ifndef __ASSEMBLY__ @@ -26,6 +23,4 @@ extern unsigned long __initdata num_mappedpages; #endif /* !__ASSEMBLY__ */ -#endif /* __KERNEL__ */ - #endif /* _ASM_SETUP_H */ |