aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-realview/realview_pb1176.c
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2008-12-01 12:53:45 -0500
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-12-01 12:53:45 -0500
commit657e1de8e742cf81153d2d15545948bd58294200 (patch)
tree0fa3df23305e3763027f819cde6016dde8b24223 /arch/arm/mach-realview/realview_pb1176.c
parent93982535a201399c0023c1166a7f16a335134d5a (diff)
parent6f13d278836d7251168631faeb0cbf5e4cdd98e5 (diff)
Merge branch 'for-rmk-realview' of git://linux-arm.org/linux-2.6 into devel
Diffstat (limited to 'arch/arm/mach-realview/realview_pb1176.c')
-rw-r--r--arch/arm/mach-realview/realview_pb1176.c11
1 files changed, 2 insertions, 9 deletions
diff --git a/arch/arm/mach-realview/realview_pb1176.c b/arch/arm/mach-realview/realview_pb1176.c
index 0481416d37c9..8f0683c22140 100644
--- a/arch/arm/mach-realview/realview_pb1176.c
+++ b/arch/arm/mach-realview/realview_pb1176.c
@@ -222,13 +222,6 @@ static struct resource realview_pb1176_smsc911x_resources[] = {
222 }, 222 },
223}; 223};
224 224
225static struct platform_device realview_pb1176_smsc911x_device = {
226 .name = "smc911x",
227 .id = 0,
228 .num_resources = ARRAY_SIZE(realview_pb1176_smsc911x_resources),
229 .resource = realview_pb1176_smsc911x_resources,
230};
231
232static void __init gic_init_irq(void) 225static void __init gic_init_irq(void)
233{ 226{
234 /* ARM1176 DevChip GIC, primary */ 227 /* ARM1176 DevChip GIC, primary */
@@ -266,7 +259,7 @@ static void __init realview_pb1176_init(void)
266#endif 259#endif
267 260
268 realview_flash_register(&realview_pb1176_flash_resource, 1); 261 realview_flash_register(&realview_pb1176_flash_resource, 1);
269 platform_device_register(&realview_pb1176_smsc911x_device); 262 realview_eth_register(NULL, realview_pb1176_smsc911x_resources);
270 263
271 for (i = 0; i < ARRAY_SIZE(amba_devs); i++) { 264 for (i = 0; i < ARRAY_SIZE(amba_devs); i++) {
272 struct amba_device *d = amba_devs[i]; 265 struct amba_device *d = amba_devs[i];
@@ -282,7 +275,7 @@ MACHINE_START(REALVIEW_PB1176, "ARM-RealView PB1176")
282 /* Maintainer: ARM Ltd/Deep Blue Solutions Ltd */ 275 /* Maintainer: ARM Ltd/Deep Blue Solutions Ltd */
283 .phys_io = REALVIEW_PB1176_UART0_BASE, 276 .phys_io = REALVIEW_PB1176_UART0_BASE,
284 .io_pg_offst = (IO_ADDRESS(REALVIEW_PB1176_UART0_BASE) >> 18) & 0xfffc, 277 .io_pg_offst = (IO_ADDRESS(REALVIEW_PB1176_UART0_BASE) >> 18) & 0xfffc,
285 .boot_params = 0x00000100, 278 .boot_params = PHYS_OFFSET + 0x00000100,
286 .map_io = realview_pb1176_map_io, 279 .map_io = realview_pb1176_map_io,
287 .init_irq = gic_init_irq, 280 .init_irq = gic_init_irq,
288 .timer = &realview_pb1176_timer, 281 .timer = &realview_pb1176_timer,