diff options
| author | Aaro Koskinen <aaro.koskinen@iki.fi> | 2018-12-04 19:57:42 +0200 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2018-12-11 08:14:23 -0800 |
| commit | c7b7b5cbd0c859b1546a5a3455d457708bdadf4c (patch) | |
| tree | 195c869933c0f23693c59ecd8f77ded1b0133e53 /arch/arm/mach-omap1 | |
| parent | 84df9525b0c27f3ebc2ebb1864fa62a97fdedb7d (diff) | |
| download | linux-stable-c7b7b5cbd0c859b1546a5a3455d457708bdadf4c.tar.gz linux-stable-c7b7b5cbd0c859b1546a5a3455d457708bdadf4c.tar.bz2 linux-stable-c7b7b5cbd0c859b1546a5a3455d457708bdadf4c.zip | |
ARM: OMAP1: fix USB configuration for device-only setups
Currently we do USB configuration only if the host mode (CONFIG_USB)
is enabled. But it should be done also in the case of device-only setups,
so change the condition to CONFIG_USB_SUPPORT. This allows to use
omap_udc on Palm Tungsten E.
Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Tony Lindgren <tony@atomide.com>
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 e8ccf51c6f29..ec0235899de2 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 77867778d4ec..5429d86c7190 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) |