diff options
author | Arnaud Patard <arnaud.patard@rtp-net.org> | 2010-04-22 04:47:43 -0400 |
---|---|---|
committer | Ben Dooks <ben-linux@fluff.org> | 2010-05-05 11:06:44 -0400 |
commit | 17dcd13a3793d434c030dcf9c52ad0d43493b2a0 (patch) | |
tree | 4540de0becd385df4ca7a2fe0f66abed1b7406fe /arch/arm/mach-s3c2410/mach-h1940.c | |
parent | 7ebd467551ed6ae200d7835a84bbda0dcadaa511 (diff) |
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/mach-h1940.c')
-rw-r--r-- | arch/arm/mach-s3c2410/mach-h1940.c | 3 |
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 = { | |||
271 | }; | 271 | }; |
272 | 272 | ||
273 | static struct platform_device *h1940_devices[] __initdata = { | 273 | static struct platform_device *h1940_devices[] __initdata = { |
274 | &s3c_device_ts, | ||
275 | &s3c_device_ohci, | 274 | &s3c_device_ohci, |
276 | &s3c_device_lcd, | 275 | &s3c_device_lcd, |
277 | &s3c_device_wdt, | 276 | &s3c_device_wdt, |
@@ -285,6 +284,8 @@ static struct platform_device *h1940_devices[] __initdata = { | |||
285 | &s3c_device_timer[0], | 284 | &s3c_device_timer[0], |
286 | &h1940_backlight, | 285 | &h1940_backlight, |
287 | &h1940_lcd_powerdev, | 286 | &h1940_lcd_powerdev, |
287 | &s3c_device_adc, | ||
288 | &s3c_device_ts, | ||
288 | }; | 289 | }; |
289 | 290 | ||
290 | static void __init h1940_map_io(void) | 291 | static void __init h1940_map_io(void) |