diff options
| author | Robert Morell <rmorell@nvidia.com> | 2011-03-29 17:19:51 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-04-26 15:54:44 -0700 |
| commit | d08f30c345d951fc56872808359c9c7b3fcf9c89 (patch) | |
| tree | 1f0b80725afdd1c791dd2472764873c412965115 /arch/arm/mach-tegra/board-touch.c | |
| parent | 0a634d511898b0407ffd4d915c4b4ad766f8e394 (diff) | |
arm: tegra: Fix build with no touch devices
If neither CONFIG_TOUCHSCREEN_PANJIT_I2C nor
CONFIG_TOUCHSCREEN_ATMEL_MT_T9 are defined, DEFAULT_SKU is undefined,
which caused the compiler to fail with an error that DEFAULT_SKU was
undefined.
Since the default is MULTI_SKU, simply use the C preprocessor to avoid
the DEFAULT_SKU case.
Original-Change-Id: Ie3444d78ebee1782e3d5594125cb803446c48371
Signed-off-by: Robert Morell <rmorell@nvidia.com>
Reviewed-on: http://git-master/r/24766
Reviewed-by: Scott Williams <scwilliams@nvidia.com>
Reviewed-by: Jin Qian <jqian@nvidia.com>
Reviewed-by: Janne Hellsten <jhellsten@nvidia.com>
Change-Id: I2fb90760f71aaef5eec5fb5d2f029c0c606398da
Diffstat (limited to 'arch/arm/mach-tegra/board-touch.c')
| -rw-r--r-- | arch/arm/mach-tegra/board-touch.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/arch/arm/mach-tegra/board-touch.c b/arch/arm/mach-tegra/board-touch.c index f8ee9472c491..9540f74b935d 100644 --- a/arch/arm/mach-tegra/board-touch.c +++ b/arch/arm/mach-tegra/board-touch.c @@ -139,10 +139,11 @@ int __init touch_init(void) if (VERBOSE_DEBUG >= 1) pr_info("### BoardInfo.sku = %04X\n", BoardInfo.sku); - if (MULTI_SKU) - sku = BoardInfo.sku & SKU_MASK; - else - sku = DEFAULT_SKU; +#if MULTI_SKU + sku = BoardInfo.sku & SKU_MASK; +#else + sku = DEFAULT_SKU; +#endif if (VERBOSE_DEBUG >= 1) pr_info("### sku = %04X\n", sku); |