Fix wrong commit
authorNelson Castillo <arhuaco@freaks-unidos.net>
Wed, 23 Sep 2009 07:44:08 +0000 (02:44 -0500)
committerNelson Castillo <arhuaco@freaks-unidos.net>
Wed, 23 Sep 2009 07:44:08 +0000 (02:44 -0500)
I'm quite sorry I sent the commit that crashes GTA01.

The fix is quite short. Fixing is easier than reverting and
fixing conflicts.

Signed-off-by: Nelson Castillo <arhuaco@freaks-unidos.net>
arch/arm/mach-s3c2410/mach-gta01.c
arch/arm/mach-s3c2442/mach-gta02.c

index 339eb84..2172695 100644 (file)
@@ -560,6 +560,7 @@ static struct platform_device *gta01_devices[] __initdata = {
        &s3c_device_sdi,
        &s3c_device_usbgadget,
        &s3c_device_nand,
+       &s3c_device_adc,
        &s3c_device_ts,
 };
 
@@ -993,10 +994,6 @@ static void __init gta01_machine_init(void)
        printk(KERN_DEBUG  "Enabled GSM wakeup IRQ %d (rc=%d)\n",
               GTA01_IRQ_MODEM, rc);
 
-#ifdef CONFIG_S3C24XX_ADC
-       platform_device_register(&s3c_device_adc);
-#endif
-
        pm_power_off = &gta01_power_off;
 }
 
index 346c229..380effa 100644 (file)
@@ -1561,6 +1561,7 @@ static struct platform_device *gta02_devices[] __initdata = {
        &s3c_device_usbgadget,
        &s3c_device_nand,
        &gta02_nor_flash,
+       &s3c_device_adc,
 
        &s3c24xx_pwm_device,
        &gta02_led_dev,
@@ -1717,9 +1718,6 @@ static void __init gta02_machine_init(void)
        gta02_vibrator_dev.dev.parent = &s3c24xx_pwm_device.dev; 
        platform_device_register(&gta02_vibrator_dev);
 #endif
-#ifdef CONFIG_S3C24XX_ADC
-        platform_device_register(&s3c_device_adc);
-#endif
 }
 
 void DEBUG_LED(int n)