summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s3c2410
diff options
context:
space:
mode:
authorArnaud Patard <arnaud.patard@rtp-net.org>2010-04-22 10:47:43 +0200
committerBen Dooks <ben-linux@fluff.org>2010-05-06 00:06:44 +0900
commit17dcd13a3793d434c030dcf9c52ad0d43493b2a0 (patch)
tree4540de0becd385df4ca7a2fe0f66abed1b7406fe /arch/arm/mach-s3c2410
parent7ebd467551ed6ae200d7835a84bbda0dcadaa511 (diff)
downloadtalos-op-linux-17dcd13a3793d434c030dcf9c52ad0d43493b2a0.tar.gz
talos-op-linux-17dcd13a3793d434c030dcf9c52ad0d43493b2a0.zip
ARM: h1940: fix touchscreen support
The touchscreen is using the adc device so it needs to be in the device list Signed-off-by: Arnaud Patard <arnaud.patard@rtp-net.org> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Diffstat (limited to 'arch/arm/mach-s3c2410')
-rw-r--r--arch/arm/mach-s3c2410/mach-h1940.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c2410/mach-h1940.c b/arch/arm/mach-s3c2410/mach-h1940.c
index fbedd0760941..bd4ced59c9ad 100644
--- a/arch/arm/mach-s3c2410/mach-h1940.c
+++ b/arch/arm/mach-s3c2410/mach-h1940.c
@@ -271,7 +271,6 @@ static struct platform_device h1940_lcd_powerdev = {
};
static struct platform_device *h1940_devices[] __initdata = {
- &s3c_device_ts,
&s3c_device_ohci,
&s3c_device_lcd,
&s3c_device_wdt,
@@ -285,6 +284,8 @@ static struct platform_device *h1940_devices[] __initdata = {
&s3c_device_timer[0],
&h1940_backlight,
&h1940_lcd_powerdev,
+ &s3c_device_adc,
+ &s3c_device_ts,
};
static void __init h1940_map_io(void)
OpenPOWER on IntegriCloud