diff options
author | Thomas White <taw@bitwiz.org.uk> | 2009-09-27 11:51:26 +0100 |
---|---|---|
committer | Thomas White <taw@bitwiz.org.uk> | 2009-09-27 11:51:26 +0100 |
commit | 464fc937c80ec25b1ac1a8c289a40a290e830e66 (patch) | |
tree | 81442d16f5c58207274949371ea6ec5089c757d8 /arch/arm/mach-s3c2442 | |
parent | cd38bcdac64aec45575ed58de66db4a2fbf1914d (diff) | |
parent | fa5743d920385c2cf344bb1a0b964af8a9511d85 (diff) |
Merge commit 'refs/remotes/openmoko/andy-tracking' into drm-tracking
Diffstat (limited to 'arch/arm/mach-s3c2442')
-rw-r--r-- | arch/arm/mach-s3c2442/Kconfig | 1 | ||||
-rw-r--r-- | arch/arm/mach-s3c2442/mach-gta02.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c2442/Kconfig b/arch/arm/mach-s3c2442/Kconfig index aa184ba7586..13fb5e190b4 100644 --- a/arch/arm/mach-s3c2442/Kconfig +++ b/arch/arm/mach-s3c2442/Kconfig @@ -36,6 +36,7 @@ config MACH_NEO1973_GTA02 select S3C_PWM select FIQ select S3C_DEV_USB_HOST + select S3C24XX_ADC help Say Y here if you are using the FIC Neo1973 GSM Phone diff --git a/arch/arm/mach-s3c2442/mach-gta02.c b/arch/arm/mach-s3c2442/mach-gta02.c index 0a93749ef8c..42b8cea9ff1 100644 --- a/arch/arm/mach-s3c2442/mach-gta02.c +++ b/arch/arm/mach-s3c2442/mach-gta02.c @@ -1562,6 +1562,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, |