aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/configs/enp2611_defconfig
diff options
context:
space:
mode:
authorLennert Buytenhek <buytenh@wantstofly.org>2006-02-08 21:09:04 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2006-02-08 21:09:04 +0000
commitf8e5b28413a8bf0b421dd116b30ab2d3befec629 (patch)
treed2bad12a64b9b654ec881fc535a8fb6820c33a1d /arch/arm/configs/enp2611_defconfig
parenta6b3300609b277989644ed4cc2f9d7c4b623f904 (diff)
[ARM] 3302/1: make pci=firmware the default for ixp2000
Patch from Lennert Buytenhek Most ixp2000 boards don't actually work if pci=firmware isn't used, so the defconfig isn't really the right place to specify this. Instead of specifying it in the defconfigs, make the relevant board code take care of setting pci=firmware. Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org> Signed-off-by: Deepak Saxena <dsaxena@plexity.net> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/configs/enp2611_defconfig')
-rw-r--r--arch/arm/configs/enp2611_defconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/configs/enp2611_defconfig b/arch/arm/configs/enp2611_defconfig
index 9592e3925c7..5fdaf3ce9d5 100644
--- a/arch/arm/configs/enp2611_defconfig
+++ b/arch/arm/configs/enp2611_defconfig
@@ -171,7 +171,7 @@ CONFIG_ALIGNMENT_TRAP=y
#
CONFIG_ZBOOT_ROM_TEXT=0x0
CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_CMDLINE="console=ttyS0,57600 root=/dev/nfs ip=bootp mem=64M@0x0 pci=firmware"
+CONFIG_CMDLINE="console=ttyS0,57600 root=/dev/nfs ip=bootp mem=64M@0x0"
# CONFIG_XIP_KERNEL is not set
#