diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-08 18:20:40 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-08 18:20:40 -0500 |
| commit | cce0cac125623f9b68f25dd1350f6d616220a8dd (patch) | |
| tree | 123a4dd9f040d05e42cadb6b01f301d6863b897f /arch/arm/configs/enp2611_defconfig | |
| parent | f564c5fe29d3fa9adc6d839714521b0554c62598 (diff) | |
| parent | 18f49ea207fbcf37f81395037f0dc1cacb2aac3c (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Manual conflict merge of arch/arm/Kconfig
Diffstat (limited to 'arch/arm/configs/enp2611_defconfig')
| -rw-r--r-- | arch/arm/configs/enp2611_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/configs/enp2611_defconfig b/arch/arm/configs/enp2611_defconfig index 9592e3925c79..5fdaf3ce9d56 100644 --- a/arch/arm/configs/enp2611_defconfig +++ b/arch/arm/configs/enp2611_defconfig | |||
| @@ -171,7 +171,7 @@ CONFIG_ALIGNMENT_TRAP=y | |||
| 171 | # | 171 | # |
| 172 | CONFIG_ZBOOT_ROM_TEXT=0x0 | 172 | CONFIG_ZBOOT_ROM_TEXT=0x0 |
| 173 | CONFIG_ZBOOT_ROM_BSS=0x0 | 173 | CONFIG_ZBOOT_ROM_BSS=0x0 |
| 174 | CONFIG_CMDLINE="console=ttyS0,57600 root=/dev/nfs ip=bootp mem=64M@0x0 pci=firmware" | 174 | CONFIG_CMDLINE="console=ttyS0,57600 root=/dev/nfs ip=bootp mem=64M@0x0" |
| 175 | # CONFIG_XIP_KERNEL is not set | 175 | # CONFIG_XIP_KERNEL is not set |
| 176 | 176 | ||
| 177 | # | 177 | # |