diff options
| author | Nelson Castillo <arhuaco@freaks-unidos.net> | 2009-09-23 02:44:08 -0500 |
|---|---|---|
| committer | Nelson Castillo <arhuaco@freaks-unidos.net> | 2009-09-23 02:44:08 -0500 |
| commit | 9c3fe7498950875215cdd2c3bb6b0bef70570be0 (patch) | |
| tree | 6a519f86533f557e2375db2094efc8476e8c75cf /arch | |
| parent | f7c1655ba09cdf316156883ab088f2030a651678 (diff) | |
Fix wrong commit
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>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-s3c2410/mach-gta01.c | 5 | ||||
| -rw-r--r-- | arch/arm/mach-s3c2442/mach-gta02.c | 4 |
2 files changed, 2 insertions, 7 deletions
diff --git a/arch/arm/mach-s3c2410/mach-gta01.c b/arch/arm/mach-s3c2410/mach-gta01.c index 339eb845744..21726956ff6 100644 --- a/arch/arm/mach-s3c2410/mach-gta01.c +++ b/arch/arm/mach-s3c2410/mach-gta01.c @@ -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 = >a01_power_off; } diff --git a/arch/arm/mach-s3c2442/mach-gta02.c b/arch/arm/mach-s3c2442/mach-gta02.c index 346c2298b08..380effad4d4 100644 --- a/arch/arm/mach-s3c2442/mach-gta02.c +++ b/arch/arm/mach-s3c2442/mach-gta02.c @@ -1561,6 +1561,7 @@ static struct platform_device *gta02_devices[] __initdata = { &s3c_device_usbgadget, &s3c_device_nand, >a02_nor_flash, + &s3c_device_adc, &s3c24xx_pwm_device, >a02_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(>a02_vibrator_dev); #endif -#ifdef CONFIG_S3C24XX_ADC - platform_device_register(&s3c_device_adc); -#endif } void DEBUG_LED(int n) |