projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'ceph-for-4.9-rc1' of git://github.com/ceph/ceph-client
[cascardo/linux.git]
/
arch
/
arm
/
mach-omap1
/
usb.c
diff --git
a/arch/arm/mach-omap1/usb.c
b/arch/arm/mach-omap1/usb.c
index
4118db5
..
2506e59
100644
(file)
--- a/
arch/arm/mach-omap1/usb.c
+++ b/
arch/arm/mach-omap1/usb.c
@@
-136,7
+136,7
@@
omap_otg_init(struct omap_usb_config *config)
}
#endif
}
#endif
-#if
defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE
)
+#if
IS_ENABLED(CONFIG_USB_OHCI_HCD
)
if (config->otg || config->register_host) {
struct platform_device *ohci_device = config->ohci_device;
int status;
if (config->otg || config->register_host) {
struct platform_device *ohci_device = config->ohci_device;
int status;
@@
-221,7
+221,7
@@
static inline void udc_device_init(struct omap_usb_config *pdata)
#endif
#endif
-#if
defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE
)
+#if
IS_ENABLED(CONFIG_USB_OHCI_HCD
)
/* The dmamask must be set for OHCI to work */
static u64 ohci_dmamask = ~(u32)0;
/* The dmamask must be set for OHCI to work */
static u64 ohci_dmamask = ~(u32)0;
@@
-612,7
+612,7
@@
static void __init omap_1510_usb_init(struct omap_usb_config *config)
}
#endif
}
#endif
-#if
defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE
)
+#if
IS_ENABLED(CONFIG_USB_OHCI_HCD
)
if (config->register_host) {
int status;
if (config->register_host) {
int status;