commit 747f3449f311289b5d08e9337241c671214ae11a
author Mike Dunn <mikedunn@newsguy.com> Thu Dec 27 10:02:20 2012 -0800
committer Haojian Zhuang <haojian.zhuang@linaro.org> Wed Jan 23 16:48:08 2013 +0800
tree f0602174c38c2bf2cce94de643f0fb3fb8e95017
parent 8b8842bfcb95b0e2c1f654be1e8c42f7fe02c21a

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>

arch/arm/mach-pxa/palmtreo.c

diff --git a/arch/arm/mach-pxa/palmtreo.c b/arch/arm/mach-pxa/palmtreo.c
index 5153435..c181a60a 100644
--- a/arch/arm/mach-pxa/palmtreo.c
+++ b/arch/arm/mach-pxa/palmtreo.c
@@ -161,7 +161,7 @@
 /******************************************************************************
  * GPIO keyboard
  ******************************************************************************/
-#if defined(CONFIG_KEYBOARD_PXA27x) || defined(CONFIG_KEYBOARD_PXA27x_MODULE)
+#if IS_ENABLED(CONFIG_KEYBOARD_PXA27x)
 static unsigned int treo680_matrix_keys[] = {
 	KEY(0, 0, KEY_F8),		/* Red/Off/Power */
 	KEY(0, 1, KEY_LEFT),
@@ -309,7 +309,7 @@
 /******************************************************************************
  * USB host
  ******************************************************************************/
-#if defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE)
+#if IS_ENABLED(CONFIG_USB_OHCI_HCD)
 static struct pxaohci_platform_data treo680_ohci_info = {
 	.port_mode    = PMM_PERPORT_MODE,
 	.flags        = ENABLE_PORT1 | ENABLE_PORT3,