Skip to content

Commit

Permalink
ARM: palmtreo: replace #if defined with IF_ENABLED
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Mike Dunn authored and Haojian Zhuang committed Jan 23, 2013
1 parent 8b8842b commit 747f344
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions arch/arm/mach-pxa/palmtreo.c
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down Expand Up @@ -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,
Expand Down

0 comments on commit 747f344

Please sign in to comment.