commit f8e5b28413a8bf0b421dd116b30ab2d3befec629
author Lennert Buytenhek <buytenh@wantstofly.org> Wed Feb 08 21:09:04 2006 +0000
committer Russell King <rmk+kernel@arm.linux.org.uk> Wed Feb 08 21:09:04 2006 +0000
tree d2bad12a64b9b654ec881fc535a8fb6820c33a1d
parent a6b3300609b277989644ed4cc2f9d7c4b623f904

[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>

arch/arm/configs/ixdp2400_defconfig

diff --git a/arch/arm/configs/ixdp2400_defconfig b/arch/arm/configs/ixdp2400_defconfig
index d9d6bb8..c67fc44 100644
--- a/arch/arm/configs/ixdp2400_defconfig
+++ b/arch/arm/configs/ixdp2400_defconfig
@@ -172,7 +172,7 @@
 #
 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
 
 #