summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap1/board-palmtt.c
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2008-12-15 23:13:26 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-12-15 23:13:26 +0100
commit7e1548a597ef7e26d5d62f8be3be6da9e101b26c (patch)
treefe6cbf4d9a3c1afdba04fb276fef0f932403727c /arch/arm/mach-omap1/board-palmtt.c
parentMerge branch 'for_rmk' of git://git.mnementh.co.uk/linux-2.6-im into devel (diff)
parentARM: OMAP3: Pin multiplexing updates for 24xx and 34xx (diff)
downloadlinux-7e1548a597ef7e26d5d62f8be3be6da9e101b26c.tar.xz
linux-7e1548a597ef7e26d5d62f8be3be6da9e101b26c.zip
Merge branch 'omap3-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 into devel
Diffstat (limited to 'arch/arm/mach-omap1/board-palmtt.c')
-rw-r--r--arch/arm/mach-omap1/board-palmtt.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap1/board-palmtt.c b/arch/arm/mach-omap1/board-palmtt.c
index 40f9860a09df..5c001afe8062 100644
--- a/arch/arm/mach-omap1/board-palmtt.c
+++ b/arch/arm/mach-omap1/board-palmtt.c
@@ -268,7 +268,7 @@ static struct platform_device *palmtt_devices[] __initdata = {
static int palmtt_get_pendown_state(void)
{
- return !omap_get_gpio_datain(6);
+ return !gpio_get_value(6);
}
static const struct ads7846_platform_data palmtt_ts_info = {