aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-pxa/palmtreo.c
diff options
context:
space:
mode:
authorMike Dunn <mikedunn@newsguy.com>2012-12-27 13:02:20 -0500
committerHaojian Zhuang <haojian.zhuang@linaro.org>2013-01-23 03:48:08 -0500
commit747f3449f311289b5d08e9337241c671214ae11a (patch)
treef0602174c38c2bf2cce94de643f0fb3fb8e95017 /arch/arm/mach-pxa/palmtreo.c
parent8b8842bfcb95b0e2c1f654be1e8c42f7fe02c21a (diff)
ARM: palmtreo: replace #if defined with IF_ENABLED
Use IF_ENABLED macro from kconfig.h. Thanks Sergei. Signed-off-by: Mike Dunn <mikedunn@newsguy.com> Acked-by: Tomas Cech <sleep_walker@suse.cz> Signed-off-by: Haojian Zhuang <haojian.zhuang@gmail.com>
Diffstat (limited to 'arch/arm/mach-pxa/palmtreo.c')
-rw-r--r--arch/arm/mach-pxa/palmtreo.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-pxa/palmtreo.c b/arch/arm/mach-pxa/palmtreo.c
index 515343506821..c181a60a23f4 100644
--- a/arch/arm/mach-pxa/palmtreo.c
+++ b/arch/arm/mach-pxa/palmtreo.c
@@ -161,7 +161,7 @@ static unsigned long centro685_pin_config[] __initdata = {
161/****************************************************************************** 161/******************************************************************************
162 * GPIO keyboard 162 * GPIO keyboard
163 ******************************************************************************/ 163 ******************************************************************************/
164#if defined(CONFIG_KEYBOARD_PXA27x) || defined(CONFIG_KEYBOARD_PXA27x_MODULE) 164#if IS_ENABLED(CONFIG_KEYBOARD_PXA27x)
165static unsigned int treo680_matrix_keys[] = { 165static unsigned int treo680_matrix_keys[] = {
166 KEY(0, 0, KEY_F8), /* Red/Off/Power */ 166 KEY(0, 0, KEY_F8), /* Red/Off/Power */
167 KEY(0, 1, KEY_LEFT), 167 KEY(0, 1, KEY_LEFT),
@@ -309,7 +309,7 @@ static inline void palmtreo_kpc_init(void) {}
309/****************************************************************************** 309/******************************************************************************
310 * USB host 310 * USB host
311 ******************************************************************************/ 311 ******************************************************************************/
312#if defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE) 312#if IS_ENABLED(CONFIG_USB_OHCI_HCD)
313static struct pxaohci_platform_data treo680_ohci_info = { 313static struct pxaohci_platform_data treo680_ohci_info = {
314 .port_mode = PMM_PERPORT_MODE, 314 .port_mode = PMM_PERPORT_MODE,
315 .flags = ENABLE_PORT1 | ENABLE_PORT3, 315 .flags = ENABLE_PORT1 | ENABLE_PORT3,