aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-ixp2000
diff options
context:
space:
mode:
authorLennert Buytenhek <buytenh@wantstofly.org>2006-02-08 16:09:02 -0500
committerRussell King <rmk+kernel@arm.linux.org.uk>2006-02-08 16:09:02 -0500
commit1b3940130415d9b338ad4e13d4b82498baef21fe (patch)
tree8cde48008539221f296b0d5ab7c57e94e41ba0dc /arch/arm/mach-ixp2000
parentac171c46667c1cb2ee9e22312291df6ed78e1b6e (diff)
[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 <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/mach-ixp2000')
-rw-r--r--arch/arm/mach-ixp2000/ixdp2x01.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-ixp2000/ixdp2x01.c b/arch/arm/mach-ixp2000/ixdp2x01.c
index 10f06606d460..bf9ecdfa5d60 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 = {
299 299
300int __init ixdp2x01_pci_init(void) 300int __init ixdp2x01_pci_init(void)
301{ 301{
302 pci_common_init(&ixdp2x01_pci); 302 if (machine_is_ixdp2401() || machine_is_ixdp2801())
303 pci_common_init(&ixdp2x01_pci);
304
303 return 0; 305 return 0;
304} 306}
305 307