diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2007-05-06 21:58:29 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2007-05-06 21:58:29 +0200 |
| commit | 5cd47155155a32e5b944ac9fc3f3dc578e429aa0 (patch) | |
| tree | ea05bfdbae04eb5ffbafa2c58fc68897a3f541d6 /arch/arm/mach-ixp4xx/ixdp425-pci.c | |
| parent | Merge branches 'arm-mm', 'at91', 'clkevts', 'imx', 'iop', 'misc', 'netx', 'ns... (diff) | |
| parent | [ARM] 4318/2: DSM-G600 Board Support (diff) | |
| download | linux-5cd47155155a32e5b944ac9fc3f3dc578e429aa0.tar.xz linux-5cd47155155a32e5b944ac9fc3f3dc578e429aa0.zip | |
Merge branch 'ixp4xx' into devel
Conflicts:
include/asm-arm/arch-ixp4xx/io.h
Diffstat (limited to 'arch/arm/mach-ixp4xx/ixdp425-pci.c')
| -rw-r--r-- | arch/arm/mach-ixp4xx/ixdp425-pci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-ixp4xx/ixdp425-pci.c b/arch/arm/mach-ixp4xx/ixdp425-pci.c index 99c1dc8033c8..408796004812 100644 --- a/arch/arm/mach-ixp4xx/ixdp425-pci.c +++ b/arch/arm/mach-ixp4xx/ixdp425-pci.c @@ -66,7 +66,7 @@ struct hw_pci ixdp425_pci __initdata = { int __init ixdp425_pci_init(void) { if (machine_is_ixdp425() || machine_is_ixcdp1100() || - machine_is_ixdp465()) + machine_is_ixdp465() || machine_is_kixrp435()) pci_common_init(&ixdp425_pci); return 0; } |