summaryrefslogtreecommitdiff
path: root/arch/arm/mach-pxa/include
diff options
context:
space:
mode:
authorMike Dunn <mikedunn@newsguy.com>2012-12-27 22:02:18 +0400
committerHaojian Zhuang <haojian.zhuang@linaro.org>2013-01-23 12:56:32 +0400
commit6a639bb83b751bfed61be13c0e3df17e5a970a94 (patch)
treef934ca4779d1d1708cbb2ae2cbc6698f67eb4d04 /arch/arm/mach-pxa/include
parent2c33727a62ac07eed3ae423c209f549394c5c4e9 (diff)
downloadlinux-6a639bb83b751bfed61be13c0e3df17e5a970a94.tar.xz
ARM: palmtreo: fix #ifdefs for leds-gpio device
The #ifdefs around the leds-gpio device platform data are erroneous. Currently the device is not instantiated on the centro unless CONFIG_MACH_TREO680 is defined. This patch eliminates the #ifdefs, and uses the machine_is_* macros to initialize the data based on which machine the code is running on and the build-time configuration. Unused data is optimized out by the build tools if build configuration does not enable support for both machines. Tested on my palm treo 680, and compile-tested for all three combinations of treo680/centro build configurations. Signed-off-by: Mike Dunn <mikedunn@newsguy.com> Acked-by: Tomas Cech <sleep_walker@suse.cz> Acked-by: Marek Vasut <marex@denx.de> Signed-off-by: Haojian Zhuang <haojian.zhuang@gmail.com>
Diffstat (limited to 'arch/arm/mach-pxa/include')
-rw-r--r--arch/arm/mach-pxa/include/mach/palmtreo.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-pxa/include/mach/palmtreo.h b/arch/arm/mach-pxa/include/mach/palmtreo.h
index 32661945d4c3..714b6574393e 100644
--- a/arch/arm/mach-pxa/include/mach/palmtreo.h
+++ b/arch/arm/mach-pxa/include/mach/palmtreo.h
@@ -38,7 +38,6 @@
#define GPIO_NR_TREO_LCD_POWER 25
/* Treo680 specific GPIOs */
-#ifdef CONFIG_MACH_TREO680
#define GPIO_NR_TREO680_SD_READONLY 33
#define GPIO_NR_TREO680_SD_POWER 42
#define GPIO_NR_TREO680_VIBRATE_EN 44
@@ -47,7 +46,6 @@
#define GPIO_NR_TREO680_LCD_POWER 77
#define GPIO_NR_TREO680_LCD_EN 86
#define GPIO_NR_TREO680_LCD_EN_N 25
-#endif /* CONFIG_MACH_TREO680 */
/* Centro685 specific GPIOs */
#define GPIO_NR_CENTRO_SD_POWER 21