diff options
| author | Tony Lindgren <tony@atomide.com> | 2018-12-11 08:14:58 -0800 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2018-12-11 08:14:58 -0800 |
| commit | 5a87809b89b64c0ccd82261de53c41f2fffb56da (patch) | |
| tree | cb41b8050bd57be049589490c778fe065fe4f77f /arch/arm/mach-omap1 | |
| parent | 1e6755f5e8f01a92ab29b86aed9d9db3ec39a681 (diff) | |
| parent | c7b7b5cbd0c859b1546a5a3455d457708bdadf4c (diff) | |
| download | linux-0-day-5a87809b89b64c0ccd82261de53c41f2fffb56da.tar.gz linux-0-day-5a87809b89b64c0ccd82261de53c41f2fffb56da.tar.xz | |
Merge branch 'omap1-usb-fix' into omap-for-v4.21/omap1
Diffstat (limited to 'arch/arm/mach-omap1')
| -rw-r--r-- | arch/arm/mach-omap1/Makefile | 2 | ||||
| -rw-r--r-- | arch/arm/mach-omap1/include/mach/usb.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap1/Makefile b/arch/arm/mach-omap1/Makefile index e8ccf51c6f292..ec0235899de20 100644 --- 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 diff --git a/arch/arm/mach-omap1/include/mach/usb.h b/arch/arm/mach-omap1/include/mach/usb.h index 77867778d4ec7..5429d86c7190d 100644 --- 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) |