diff options
Diffstat (limited to 'arch/arm/mach-tegra/board-apalis_t30.c')
-rw-r--r-- | arch/arm/mach-tegra/board-apalis_t30.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-tegra/board-apalis_t30.c b/arch/arm/mach-tegra/board-apalis_t30.c index 4db8957d8ccf..fdbc2c10230e 100644 --- a/arch/arm/mach-tegra/board-apalis_t30.c +++ b/arch/arm/mach-tegra/board-apalis_t30.c @@ -508,7 +508,9 @@ static struct gpio apalis_t30_gpios[] = { #ifndef POWER_GPIO {APALIS_GPIO5, GPIOF_IN, "GPIO5 X1-9"}, #endif -#ifndef FORCE_OFF_GPIO +#if !defined(CONFIG_TOUCHSCREEN_ATMEL_MXT) \ + && !defined(CONFIG_TOUCHSCREEN_ATMEL_MXT_MODULE) \ + && !defined(FORCE_OFF_GPIO) {APALIS_GPIO6, GPIOF_OUT_INIT_HIGH, "GPIO6 X1-11"}, #endif /* GPIO7 is used by PCIe driver on Evaluation board */ |