[ARM PATCH] 1710/1: pxa2xx_udc (2/5) mach-pxa/idp.c uses INIT_MACHINE

Patch from David Brownell

This just makes the IDP initialization code use this initcall, so
that it won't run unless it's actually on IDP hardware.

Depends on the INIT_MACHINE patch (#1 this series).

diff --git a/arch/arm/mach-pxa/idp.c b/arch/arm/mach-pxa/idp.c
index 71b64a6d9fccbbcd3083b8574223448c73ea58d5..23aaa97800c5c0ec3218fea82957e5a2fef28801 100644 (file)
--- a/arch/arm/mach-pxa/idp.c
+++ b/arch/arm/mach-pxa/idp.c
@@ -54,14 +54,11 @@ unsigned int idp_control_port_shadow = ((0x7 << 21) |               /* LCD power */
 
 #endif
 
-static int __init idp_init(void)
+static void __init idp_init(void)
 {
        printk("idp_init()\n");
-       return 0;
 }
 
-__initcall(idp_init);
-
 static void __init idp_init_irq(void)
 {
        pxa_init_irq();
@@ -119,4 +116,5 @@ MACHINE_START(PXA_IDP, "Accelent Xscale IDP")
        BOOT_MEM(0xa0000000, 0x40000000, 0xfc000000)
        MAPIO(idp_map_io)
        INITIRQ(idp_init_irq)
+       INIT_MACHINE(idp_init)
 MACHINE_END