Commit 1b394013 authored Feb 08, 2006 by Lennert Buytenhek Committed by Russell King Feb 08, 2006

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

parent ac171c46

arch/arm/mach-ixp2000/ixdp2x01.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -299,7 +299,9 @@ struct hw_pci ixdp2x01_pci __initdata = {

		int __init ixdp2x01_pci_init(void)
		{
		if (machine_is_ixdp2401() \|\| machine_is_ixdp2801())
		pci_common_init(&ixdp2x01_pci);

		return 0;
		}