[ARM] 3300/1: make ixdp2x01 co-exist with other ixp2000 machine types
authorLennert Buytenhek <buytenh@wantstofly.org>
Wed, 8 Feb 2006 21:09:02 +0000 (21:09 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 8 Feb 2006 21:09:02 +0000 (21:09 +0000)
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 <buytenh@wantstofly.org>
Signed-off-by: Deepak Saxena <dsaxena@plexity.net>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
arch/arm/mach-ixp2000/ixdp2x01.c

index 10f06606d460a0b291a6cc6dfddebdbc0cd8d5ed..bf9ecdfa5d60472735ca7fab26cb71cfb39ae79c 100644 (file)
@@ -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;
 }