git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'next/deletion' of git://git.linaro.org/people/arnd/arm-soc
[pandora-kernel.git]
/
arch
/
arm
/
mach-s5p64x0
/
mach-smdk6450.c
diff --git
a/arch/arm/mach-s5p64x0/mach-smdk6450.c
b/arch/arm/mach-s5p64x0/mach-smdk6450.c
index
d99d29b
..
e1b277b
100644
(file)
--- a/
arch/arm/mach-s5p64x0/mach-smdk6450.c
+++ b/
arch/arm/mach-s5p64x0/mach-smdk6450.c
@@
-148,12
+148,6
@@
static struct i2c_board_info smdk6450_i2c_devs1[] __initdata = {
{ I2C_BOARD_INFO("24c128", 0x57), },/* Samsung S524AD0XD1 EEPROM */
};
{ I2C_BOARD_INFO("24c128", 0x57), },/* Samsung S524AD0XD1 EEPROM */
};
-static struct s3c2410_ts_mach_info s3c_ts_platform __initdata = {
- .delay = 10000,
- .presc = 49,
- .oversampling_shift = 2,
-};
-
/* LCD Backlight data */
static struct samsung_bl_gpio_info smdk6450_bl_gpio_info = {
.no = S5P6450_GPF(15),
/* LCD Backlight data */
static struct samsung_bl_gpio_info smdk6450_bl_gpio_info = {
.no = S5P6450_GPF(15),
@@
-174,7
+168,7
@@
static void __init smdk6450_map_io(void)
static void __init smdk6450_machine_init(void)
{
static void __init smdk6450_machine_init(void)
{
- s3c24xx_ts_set_platdata(
&s3c_ts_platform
);
+ s3c24xx_ts_set_platdata(
NULL
);
s3c_i2c0_set_platdata(&s5p6450_i2c0_data);
s3c_i2c1_set_platdata(&s5p6450_i2c1_data);
s3c_i2c0_set_platdata(&s5p6450_i2c0_data);
s3c_i2c1_set_platdata(&s5p6450_i2c1_data);