projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'work.splice_read' of git://git.kernel.org/pub/scm/linux/kernel/git...
[cascardo/linux.git]
/
arch
/
arm
/
mach-omap1
/
include
/
mach
/
usb.h
diff --git
a/arch/arm/mach-omap1/include/mach/usb.h
b/arch/arm/mach-omap1/include/mach/usb.h
index
2c26305
..
a7c5559
100644
(file)
--- a/
arch/arm/mach-omap1/include/mach/usb.h
+++ b/
arch/arm/mach-omap1/include/mach/usb.h
@@
-12,7
+12,7
@@
void omap_otg_init(struct omap_usb_config *config);
void omap_otg_init(struct omap_usb_config *config);
-#if
defined(CONFIG_USB) || defined(CONFIG_USB_MODULE
)
+#if
IS_ENABLED(CONFIG_USB
)
void omap1_usb_init(struct omap_usb_config *pdata);
#else
static inline void omap1_usb_init(struct omap_usb_config *pdata)
void omap1_usb_init(struct omap_usb_config *pdata);
#else
static inline void omap1_usb_init(struct omap_usb_config *pdata)