Merge branch 'omap1-usb-fix' into omap-for-v4.21/omap1

5a87809b · Tony Lindgren · 1e6755f5 · c7b7b5cb · 5a87809b · 5a87809b
Commit 5a87809b authored Dec 11, 2018 by Tony Lindgren
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

arch/arm/mach-omap1/Makefile arch/arm/mach-omap1/Makefile +1 -1

arch/arm/mach-omap1/include/mach/usb.h arch/arm/mach-omap1/include/mach/usb.h +1 -1

No files found.
--- a/arch/arm/mach-omap1/Makefile
+++ b/arch/arm/mach-omap1/Makefile
@@ -25,7 +25,7 @@ obj-y					+= $(i2c-omap-m) $(i2c-omap-y)

 led-y := leds.o

-usb-fs-$(CONFIG_USB)			:= usb.o
+usb-fs-$(CONFIG_USB_SUPPORT)		:= usb.o
 obj-y					+= $(usb-fs-m) $(usb-fs-y)

 # Specific board support

--- a/arch/arm/mach-omap1/include/mach/usb.h
+++ b/arch/arm/mach-omap1/include/mach/usb.h
@@ -11,7 +11,7 @@

 #include <linux/platform_data/usb-omap1.h>

-#if IS_ENABLED(CONFIG_USB)
+#if IS_ENABLED(CONFIG_USB_SUPPORT)
 void omap1_usb_init(struct omap_usb_config *pdata);
 #else
 static inline void omap1_usb_init(struct omap_usb_config *pdata)