summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2013-04-25 19:29:03 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-04-25 10:58:00 -0700
commitc3c683ead3c53c0eb67b72c54e130baf45ac25d2 (patch)
tree24bb1c56f3615166872630adc03f8727bd90f178 /arch
parent64e98a7981fbf31ea955d9cec3b6ac52717c6f8a (diff)
downloadlinux-c3c683ead3c53c0eb67b72c54e130baf45ac25d2.tar.gz
linux-c3c683ead3c53c0eb67b72c54e130baf45ac25d2.tar.bz2
linux-c3c683ead3c53c0eb67b72c54e130baf45ac25d2.zip
USB: OMAP: ISP1301 needs USB_PHY
The Kconfig entry for USB_OMAP unconditionally selects USB_ISP1301, which is now only visible when USB_PHY is also enabled. This adds an appropriate dependency and enables USB_PHY in the omap1 defconfig, avoiding these build warnings: warning: (USB_OHCI_HCD && USB_OMAP) selects ISP1301_OMAP which has unmet direct dependencies (USB_SUPPORT && USB_PHY && I2C && ARCH_OMAP_OTG) Also fix a Makefile typo while we're at it. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Cc: Felipe Balbi <balbi@ti.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/configs/omap1_defconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/configs/omap1_defconfig b/arch/arm/configs/omap1_defconfig
index 42eab9a2a0fd..7e0ebb64a7f9 100644
--- a/arch/arm/configs/omap1_defconfig
+++ b/arch/arm/configs/omap1_defconfig
@@ -195,6 +195,7 @@ CONFIG_SND_SOC=y
CONFIG_SND_OMAP_SOC=y
# CONFIG_USB_HID is not set
CONFIG_USB=y
+CONFIG_USB_PHY=y
CONFIG_USB_DEBUG=y
CONFIG_USB_DEVICEFS=y
# CONFIG_USB_DEVICE_CLASS is not set