hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
Tony Lindgren 2018-12-11 08:14:58 -08:00
parent 1e6755f5e8 c7b7b5cbd0
commit 5a87809b89
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-omap1/Makefile
View File

@ -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

2
arch/arm/mach-omap1/include/mach/usb.h
View File

@ -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)