Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 747f3449 authored by Mike Dunn's avatar Mike Dunn Committed by Haojian Zhuang
Browse files

ARM: palmtreo: replace #if defined with IF_ENABLED 



Use IF_ENABLED macro from kconfig.h.  Thanks Sergei.

Signed-off-by: default avatarMike Dunn <mikedunn@newsguy.com>
Acked-by: default avatarTomas Cech <sleep_walker@suse.cz>
Signed-off-by: default avatarHaojian Zhuang <haojian.zhuang@gmail.com>
parent 8b8842bf

arch/arm/mach-pxa/palmtreo.c

+2 −2
Original line number Diff line number Diff line
@@ -161,7 +161,7 @@ static unsigned long centro685_pin_config[] __initdata = { 
/******************************************************************************

 * 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 @@ static inline void palmtreo_kpc_init(void) {} 
/******************************************************************************

 * 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,