diff options
author | Arnd Bergmann <arnd@arndb.de> | 2011-09-20 16:15:55 -0400 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2011-09-20 16:15:55 -0400 |
commit | da1c5afee092a2b51136ac3bf20c68bfff2924be (patch) | |
tree | fa71b9e3af25c870012a22e4cb72547f9aafcfd0 /arch/arm/mach-s5pc100/mach-smdkc100.c | |
parent | 1fdb4888e45f1413972a8e9da55f3ffc08b9abcb (diff) | |
parent | 4c59de052e7167a3bcf3f32c5ea4c9a5ef07386a (diff) |
Merge branch 'samsung/cleanup' into next/cleanup
Diffstat (limited to 'arch/arm/mach-s5pc100/mach-smdkc100.c')
-rw-r--r-- | arch/arm/mach-s5pc100/mach-smdkc100.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/arch/arm/mach-s5pc100/mach-smdkc100.c b/arch/arm/mach-s5pc100/mach-smdkc100.c index 227d8908aab6..0b70762ebf1a 100644 --- a/arch/arm/mach-s5pc100/mach-smdkc100.c +++ b/arch/arm/mach-s5pc100/mach-smdkc100.c | |||
@@ -203,12 +203,6 @@ static struct platform_device *smdkc100_devices[] __initdata = { | |||
203 | &s5pc100_device_spdif, | 203 | &s5pc100_device_spdif, |
204 | }; | 204 | }; |
205 | 205 | ||
206 | static struct s3c2410_ts_mach_info s3c_ts_platform __initdata = { | ||
207 | .delay = 10000, | ||
208 | .presc = 49, | ||
209 | .oversampling_shift = 2, | ||
210 | }; | ||
211 | |||
212 | /* LCD Backlight data */ | 206 | /* LCD Backlight data */ |
213 | static struct samsung_bl_gpio_info smdkc100_bl_gpio_info = { | 207 | static struct samsung_bl_gpio_info smdkc100_bl_gpio_info = { |
214 | .no = S5PC100_GPD(0), | 208 | .no = S5PC100_GPD(0), |
@@ -228,7 +222,7 @@ static void __init smdkc100_map_io(void) | |||
228 | 222 | ||
229 | static void __init smdkc100_machine_init(void) | 223 | static void __init smdkc100_machine_init(void) |
230 | { | 224 | { |
231 | s3c24xx_ts_set_platdata(&s3c_ts_platform); | 225 | s3c24xx_ts_set_platdata(NULL); |
232 | 226 | ||
233 | /* I2C */ | 227 | /* I2C */ |
234 | s3c_i2c0_set_platdata(NULL); | 228 | s3c_i2c0_set_platdata(NULL); |