diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-10 02:12:03 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-10 02:12:03 (GMT) |
| commit | 23d5385f382a7c7d8b6bf19b0c2cfb3acbb12d31 (patch) | |
| tree | b0e2fbbdd8a9b86e0074affd58e35bea9c22e175 /arch/sparc/include/asm/setup.h | |
| parent | b7e97d22113bcaafff93774e3085f5b567eaba9c (diff) | |
| parent | 9836d3458cde82626f2828ca6bd44c4a02b56e63 (diff) | |
| download | linux-23d5385f382a7c7d8b6bf19b0c2cfb3acbb12d31.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
Pull sparc update from David Miller:
"This is just the UAPI commits for sparc via David Howells."
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
UAPI: (Scripted) Disintegrate arch/sparc/include/asm
Diffstat (limited to 'arch/sparc/include/asm/setup.h')
| -rw-r--r-- | arch/sparc/include/asm/setup.h | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/arch/sparc/include/asm/setup.h b/arch/sparc/include/asm/setup.h index 8a83699..5e35e05 100644 --- a/arch/sparc/include/asm/setup.h +++ b/arch/sparc/include/asm/setup.h @@ -1,17 +1,11 @@ /* * Just a place holder. */ - #ifndef _SPARC_SETUP_H #define _SPARC_SETUP_H -#if defined(__sparc__) && defined(__arch64__) -# define COMMAND_LINE_SIZE 2048 -#else -# define COMMAND_LINE_SIZE 256 -#endif +#include <uapi/asm/setup.h> -#ifdef __KERNEL__ extern char reboot_command[]; @@ -34,6 +28,4 @@ extern void sun_do_break(void); extern int stop_a_enabled; extern int scons_pwroff; -#endif /* __KERNEL__ */ - #endif /* _SPARC_SETUP_H */ |