diff options
-rw-r--r-- | arch/arm/mach-ixp4xx/ixdp425-pci.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-ixp4xx/ixdp425-setup.c | 20 |
2 files changed, 1 insertions, 21 deletions
diff --git a/arch/arm/mach-ixp4xx/ixdp425-pci.c b/arch/arm/mach-ixp4xx/ixdp425-pci.c index d5156c043f0b..99c1dc8033c8 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 = { | |||
66 | int __init ixdp425_pci_init(void) | 66 | int __init ixdp425_pci_init(void) |
67 | { | 67 | { |
68 | if (machine_is_ixdp425() || machine_is_ixcdp1100() || | 68 | if (machine_is_ixdp425() || machine_is_ixcdp1100() || |
69 | machine_is_avila() || machine_is_ixdp465()) | 69 | machine_is_ixdp465()) |
70 | pci_common_init(&ixdp425_pci); | 70 | pci_common_init(&ixdp425_pci); |
71 | return 0; | 71 | return 0; |
72 | } | 72 | } |
diff --git a/arch/arm/mach-ixp4xx/ixdp425-setup.c b/arch/arm/mach-ixp4xx/ixdp425-setup.c index da72383ee301..04b1d56396a0 100644 --- a/arch/arm/mach-ixp4xx/ixdp425-setup.c +++ b/arch/arm/mach-ixp4xx/ixdp425-setup.c | |||
@@ -156,23 +156,3 @@ MACHINE_START(IXCDP1100, "Intel IXCDP1100 Development Platform") | |||
156 | .init_machine = ixdp425_init, | 156 | .init_machine = ixdp425_init, |
157 | MACHINE_END | 157 | MACHINE_END |
158 | #endif | 158 | #endif |
159 | |||
160 | /* | ||
161 | * Avila is functionally equivalent to IXDP425 except that it adds | ||
162 | * a CF IDE slot hanging off the expansion bus. When we have a | ||
163 | * driver for IXP4xx CF IDE with driver model support we'll move | ||
164 | * Avila to it's own setup file. | ||
165 | */ | ||
166 | #ifdef CONFIG_ARCH_AVILA | ||
167 | MACHINE_START(AVILA, "Gateworks Avila Network Platform") | ||
168 | /* Maintainer: Deepak Saxena <dsaxena@plexity.net> */ | ||
169 | .phys_io = IXP4XX_PERIPHERAL_BASE_PHYS, | ||
170 | .io_pg_offst = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc, | ||
171 | .map_io = ixp4xx_map_io, | ||
172 | .init_irq = ixp4xx_init_irq, | ||
173 | .timer = &ixp4xx_timer, | ||
174 | .boot_params = 0x0100, | ||
175 | .init_machine = ixdp425_init, | ||
176 | MACHINE_END | ||
177 | #endif | ||
178 | |||