diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-05-30 23:59:19 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-05-30 23:59:19 -0400 |
| commit | 8fa76f7e61ef4e5bc97207143ea4e198b22487bc (patch) | |
| tree | 266c42b6687e68e4febb72d8c031e5facd899a1c /arch/arm/mach-omap2/board-3430sdp.c | |
| parent | a41a7b91772da2c77ac0da74285fd8ebd86a85ba (diff) | |
| parent | 67a3e12b05e055c0415c556a315a3d3eb637e29e (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/arm/mach-omap2/board-3430sdp.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-3430sdp.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/mach-omap2/board-3430sdp.c b/arch/arm/mach-omap2/board-3430sdp.c index e7d629b3c76a..f474a80b8867 100644 --- a/arch/arm/mach-omap2/board-3430sdp.c +++ b/arch/arm/mach-omap2/board-3430sdp.c | |||
| @@ -137,9 +137,7 @@ static void ads7846_dev_init(void) | |||
| 137 | } | 137 | } |
| 138 | 138 | ||
| 139 | gpio_direction_input(ts_gpio); | 139 | gpio_direction_input(ts_gpio); |
| 140 | 140 | gpio_set_debounce(ts_gpio, 310); | |
| 141 | omap_set_gpio_debounce(ts_gpio, 1); | ||
| 142 | omap_set_gpio_debounce_time(ts_gpio, 0xa); | ||
| 143 | } | 141 | } |
| 144 | 142 | ||
| 145 | static int ads7846_get_pendown_state(void) | 143 | static int ads7846_get_pendown_state(void) |