diff options
| author | Scott Williams <scwilliams@nvidia.com> | 2011-04-15 12:49:44 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-04-26 15:55:56 -0700 |
| commit | bda41158fc7c105845d13dde1172f10d24549645 (patch) | |
| tree | 4a80df680f6cd054fceec216560745f983771fb6 /arch/arm/mach-tegra/board-touch.c | |
| parent | d43c8a14e95d3443b972c2a3f599ab3fdb8fe77a (diff) | |
ARM: tegra: touch: Fix incorrect use of conditionals
Use #elif defined(CONFIG_x) instead of the incorrect #elif CONFIG_x
when including board-specific touch panel configuration headers.
Original-Change-Id: I0b8678030e057b2ccf29cec5051aaa76e366982e
Reviewed-on: http://git-master/r/27925
Reviewed-by: Robert R Collins <rcollins@nvidia.com>
Tested-by: Scott Williams <scwilliams@nvidia.com>
Reviewed-by: Krishna Reddy <vdumpa@nvidia.com>
Reviewed-by: Scott Williams <scwilliams@nvidia.com>
Reviewed-by: Mallikarjun Kasoju <mkasoju@nvidia.com>
Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
Change-Id: Ie3a99d8c64fe64928e764d3c4172f1fb38c217b2
Diffstat (limited to 'arch/arm/mach-tegra/board-touch.c')
| -rw-r--r-- | arch/arm/mach-tegra/board-touch.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-tegra/board-touch.c b/arch/arm/mach-tegra/board-touch.c index 3d0181c9e3fb..c5ffe189afa5 100644 --- a/arch/arm/mach-tegra/board-touch.c +++ b/arch/arm/mach-tegra/board-touch.c @@ -28,11 +28,11 @@ #include <linux/gpio.h> #include "board.h" -#ifdef CONFIG_MACH_VENTANA +#if defined(CONFIG_MACH_VENTANA) #include "board-ventana.h" -#elif CONFIG_MACH_CARDHU +#elif defined(CONFIG_MACH_CARDHU) #include "board-cardhu.h" -#elif CONFIG_MACH_TEGRA_ENTERPRISE +#elif defined(CONFIG_MACH_TEGRA_ENTERPRISE) #include "board-enterprise.h" #endif #include "gpio-names.h" |