Commit 5a87809b authored by Tony Lindgren's avatar Tony Lindgren
Browse files

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

parents 1e6755f5 c7b7b5cb

arch/arm/mach-omap1/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -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

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

+1 −1
Original line number Diff line number Diff line
@@ -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)

CRA Git | Maintained and supported by SUSTech CRA and CCSE