diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-08-08 18:33:47 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-08-08 20:18:18 +0200 |
| commit | 097d9eb537ff4d88b74c3fe67392e27c478ca3c5 (patch) | |
| tree | 9034d676d9096857a380aab9d99e3e88fccb6bfe /arch/m68knommu/include/asm/setup.h | |
| parent | [ARM] 5177/1: arm/mach-sa1100/Makefile: remove CONFIG_SA1100_USB (diff) | |
| parent | Merge branch 'tracehook' of git://git.kernel.org/pub/scm/linux/kernel/git/fro... (diff) | |
| download | linux-097d9eb537ff4d88b74c3fe67392e27c478ca3c5.tar.xz linux-097d9eb537ff4d88b74c3fe67392e27c478ca3c5.zip | |
Merge Linus' latest into master
Conflicts:
drivers/watchdog/at91rm9200_wdt.c
drivers/watchdog/davinci_wdt.c
drivers/watchdog/ep93xx_wdt.c
drivers/watchdog/ixp2000_wdt.c
drivers/watchdog/ixp4xx_wdt.c
drivers/watchdog/ks8695_wdt.c
drivers/watchdog/omap_wdt.c
drivers/watchdog/pnx4008_wdt.c
drivers/watchdog/sa1100_wdt.c
drivers/watchdog/wdt285.c
Diffstat (limited to 'arch/m68knommu/include/asm/setup.h')
| -rw-r--r-- | arch/m68knommu/include/asm/setup.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/m68knommu/include/asm/setup.h b/arch/m68knommu/include/asm/setup.h new file mode 100644 index 000000000000..fb86bb2a6078 --- /dev/null +++ b/arch/m68knommu/include/asm/setup.h @@ -0,0 +1,10 @@ +#ifdef __KERNEL__ + +#include <asm-m68k/setup.h> + +/* We have a bigger command line buffer. */ +#undef COMMAND_LINE_SIZE + +#endif /* __KERNEL__ */ + +#define COMMAND_LINE_SIZE 512 |