diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2012-10-11 11:15:03 +0200 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2012-10-11 11:15:03 +0200 |
| commit | 35bafbee4b4732a2820bbd0ef141c8192ff29731 (patch) | |
| tree | dc4709ea5c1faeb357e17d07a73f2e27eb6aad52 /arch/mips/include/asm/setup.h | |
| parent | 49a94e9482e70777ae0e03351a0c2c18bbdfebda (diff) | |
| parent | 61730c538f8281efa7ac12596da9f3f9a31b9272 (diff) | |
Merge tag 'disintegrate-mips-20121009' of git://git.infradead.org/users/dhowells/linux-headers into mips-for-linux-next
UAPI Disintegration 2012-10-09
Patchwork: https://patchwork.linux-mips.org/patch/4414/
Diffstat (limited to 'arch/mips/include/asm/setup.h')
| -rw-r--r-- | arch/mips/include/asm/setup.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/mips/include/asm/setup.h b/arch/mips/include/asm/setup.h index 2560b6b6a7d..e26589ef36e 100644 --- a/arch/mips/include/asm/setup.h +++ b/arch/mips/include/asm/setup.h @@ -1,9 +1,8 @@ #ifndef _MIPS_SETUP_H #define _MIPS_SETUP_H -#define COMMAND_LINE_SIZE 4096 +#include <uapi/asm/setup.h> -#ifdef __KERNEL__ extern void setup_early_printk(void); extern void set_handler(unsigned long offset, void *addr, unsigned long len); @@ -17,6 +16,4 @@ extern unsigned long ebase; extern void per_cpu_trap_init(bool); extern void cpu_cache_init(void); -#endif /* __KERNEL__ */ - #endif /* __SETUP_H */ |