From: Lennert Buytenhek Date: Wed, 8 Feb 2006 21:09:02 +0000 (+0000) Subject: [ARM] 3300/1: make ixdp2x01 co-exist with other ixp2000 machine types X-Git-Tag: v2.6.16-rc3~56^2~18 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=1b3940130415d9b338ad4e13d4b82498baef21fe;p=linux-2.6-omap-h63xx.git [ARM] 3300/1: make ixdp2x01 co-exist with other ixp2000 machine types Patch from Lennert Buytenhek The ixdp2x01 pci init call doesn't check whether it's really running on an ixdp2x01, making it impossible to compile one kernel that works on both the ixdp2x01 and another ixp2000 board. Signed-off-by: Lennert Buytenhek Signed-off-by: Deepak Saxena Signed-off-by: Russell King --- diff --git a/arch/arm/mach-ixp2000/ixdp2x01.c b/arch/arm/mach-ixp2000/ixdp2x01.c index 10f06606d46..bf9ecdfa5d6 100644 --- a/arch/arm/mach-ixp2000/ixdp2x01.c +++ b/arch/arm/mach-ixp2000/ixdp2x01.c @@ -299,7 +299,9 @@ struct hw_pci ixdp2x01_pci __initdata = { int __init ixdp2x01_pci_init(void) { - pci_common_init(&ixdp2x01_pci); + if (machine_is_ixdp2401() || machine_is_ixdp2801()) + pci_common_init(&ixdp2x01_pci); + return 0; }