aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/mach-mmp/aspenite.c
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2014-03-12 15:29:22 +0100
committerArnd Bergmann <arnd@arndb.de>2014-03-18 16:03:44 +0100
commit3524080826c289df0efd5159282f6c4aeacf0c11 (patch)
treef532fcd500b7d5b347183714b5612128b404009c /arch/arm/mach-mmp/aspenite.c
parentbfdad565ae0a61ac943974b8ae61ec0ed55ceb04 (diff)
downloadlinux-linaro-stable-3524080826c289df0efd5159282f6c4aeacf0c11.tar.gz
ARM: mmp: allow platform devices with modular USB
The USB host drivers need platform data to be defined on pxa168 and pxa910, but the conditionals used in the devices.c file only work if the drivers are built-in. This patch fixes the definition by changing the #ifdef to #if IS_ENABLED(), which works both for built-in and modular Kconfig symbols. I found one specific problem using 'randconfig' builds, but for consistency, this patch uses IS_ENABLED() for all Kconfig symbols in these three files. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Haojian Zhuang <haojian.zhuang@gmail.com>
Diffstat (limited to 'arch/arm/mach-mmp/aspenite.c')
-rw-r--r--arch/arm/mach-mmp/aspenite.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-mmp/aspenite.c b/arch/arm/mach-mmp/aspenite.c
index 0c002099c3a3..7e0248582efd 100644
--- a/arch/arm/mach-mmp/aspenite.c
+++ b/arch/arm/mach-mmp/aspenite.c
@@ -231,7 +231,7 @@ static struct pxa27x_keypad_platform_data aspenite_keypad_info __initdata = {
.debounce_interval = 30,
};
-#if defined(CONFIG_USB_EHCI_MV)
+#if IS_ENABLED(CONFIG_USB_EHCI_MV)
static struct mv_usb_platform_data pxa168_sph_pdata = {
.mode = MV_USB_MODE_HOST,
.phy_init = pxa_usb_phy_init,
@@ -258,7 +258,7 @@ static void __init common_init(void)
/* off-chip devices */
platform_device_register(&smc91x_device);
-#if defined(CONFIG_USB_EHCI_MV)
+#if IS_ENABLED(CONFIG_USB_EHCI_MV)
pxa168_add_usb_host(&pxa168_sph_pdata);
#endif
}