Skip to content

Commit

Permalink
[ARM] 3300/1: make ixdp2x01 co-exist with other ixp2000 machine types
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Lennert Buytenhek authored and Russell King committed Feb 8, 2006
1 parent ac171c4 commit 1b39401
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion arch/arm/mach-ixp2000/ixdp2x01.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down

0 comments on commit 1b39401

Please sign in to comment.