diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-09 00:20:40 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-09 00:20:40 +0100 |
| commit | cce0cac125623f9b68f25dd1350f6d616220a8dd (patch) | |
| tree | 123a4dd9f040d05e42cadb6b01f301d6863b897f /arch/arm/configs/ixdp2401_defconfig | |
| parent | Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus (diff) | |
| parent | [ARM] 3278/1: OMAP: 3/3 Fix low-level io init for omap2 boards (diff) | |
| download | linux-cce0cac125623f9b68f25dd1350f6d616220a8dd.tar.xz linux-cce0cac125623f9b68f25dd1350f6d616220a8dd.zip | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Manual conflict merge of arch/arm/Kconfig
Diffstat (limited to 'arch/arm/configs/ixdp2401_defconfig')
| -rw-r--r-- | arch/arm/configs/ixdp2401_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/configs/ixdp2401_defconfig b/arch/arm/configs/ixdp2401_defconfig index 2dc9d499c7d7..60d66e82c51f 100644 --- a/arch/arm/configs/ixdp2401_defconfig +++ b/arch/arm/configs/ixdp2401_defconfig @@ -172,7 +172,7 @@ CONFIG_ALIGNMENT_TRAP=y # CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="console=ttyS0,115200 root=/dev/nfs ip=bootp mem=64M@0x0 pci=firmware" +CONFIG_CMDLINE="console=ttyS0,115200 root=/dev/nfs ip=bootp mem=64M@0x0" # CONFIG_XIP_KERNEL is not set # |