summaryrefslogtreecommitdiff
path: root/arch/arm/mach-tegra/board-ventana.h
diff options
context:
space:
mode:
authorJin Qian <jqian@nvidia.com>2011-03-25 12:34:31 -0700
committerDan Willemsen <dwillemsen@nvidia.com>2011-04-26 15:54:41 -0700
commit98e5352aed58693a46f409b78a8cd93b9a6a318c (patch)
tree8ef134602cc15d24559d8443a27e09a9903340a5 /arch/arm/mach-tegra/board-ventana.h
parent2ed1f62ad5a22bf74a2bee4a8ccf69c5fe440d7e (diff)
ARM: tegra: ventana: fix build errors
Original-Change-Id: Ic7acc7057e742299b812e7dd0fb151cc5baaa79b Reviewed-on: http://git-master/r/24329 Reviewed-by: Jin Qian <jqian@nvidia.com> Tested-by: Jin Qian <jqian@nvidia.com> Reviewed-by: Scott Williams <scwilliams@nvidia.com> Change-Id: I81549007b4ce86d1b87bbe31db3da999d3d4e0fa
Diffstat (limited to 'arch/arm/mach-tegra/board-ventana.h')
-rw-r--r--arch/arm/mach-tegra/board-ventana.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/mach-tegra/board-ventana.h b/arch/arm/mach-tegra/board-ventana.h
index 42e6e6696557..497c32327074 100644
--- a/arch/arm/mach-tegra/board-ventana.h
+++ b/arch/arm/mach-tegra/board-ventana.h
@@ -24,7 +24,7 @@ int ventana_pinmux_init(void);
int ventana_panel_init(void);
int ventana_wired_jack_init(void);
int ventana_sensors_init(void);
-int ventana_touch_init(void);
+int touch_init(void);
int ventana_kbc_init(void);
int ventana_emc_init(void);
@@ -64,13 +64,13 @@ int ventana_emc_init(void);
/* Touchscreen GPIO addresses */
#ifdef CONFIG_TOUCHSCREEN_PANJIT_I2C
-#define TOUCH_GPIO_IRQ TEGRA_GPIO_PV6
-#define TOUCH_GPIO_RST TEGRA_GPIO_PQ7
+#define TOUCH_GPIO_IRQ_PANJIT TEGRA_GPIO_PV6
+#define TOUCH_GPIO_RST_PANJIT TEGRA_GPIO_PQ7
#endif
#ifdef CONFIG_TOUCHSCREEN_ATMEL_MT_T9
-#define TOUCH_GPIO_IRQ TEGRA_GPIO_PV6
-#define TOUCH_GPIO_RST TEGRA_GPIO_PQ7
+#define TOUCH_GPIO_IRQ_ATMEL_T9 TEGRA_GPIO_PV6
+#define TOUCH_GPIO_RST_ATMEL_T9 TEGRA_GPIO_PQ7
#endif
#endif