summaryrefslogtreecommitdiffstats
path: root/drivers/usb/phy
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 /drivers/usb/phy
parent64e98a7981fbf31ea955d9cec3b6ac52717c6f8a (diff)
downloadblackbird-op-linux-c3c683ead3c53c0eb67b72c54e130baf45ac25d2.tar.gz
blackbird-op-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 'drivers/usb/phy')
-rw-r--r--drivers/usb/phy/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/phy/Makefile b/drivers/usb/phy/Makefile
index 33863c09f3dc..a9169cb1e6fc 100644
--- a/drivers/usb/phy/Makefile
+++ b/drivers/usb/phy/Makefile
@@ -11,7 +11,7 @@ obj-$(CONFIG_USB_PHY) += phy.o
obj-$(CONFIG_AB8500_USB) += phy-ab8500-usb.o
phy-fsl-usb2-objs := phy-fsl-usb.o phy-fsm-usb.o
obj-$(CONFIG_FSL_USB2_OTG) += phy-fsl-usb2.o
-obj-$(CONFIG_ISP1301_OMAP) += phy-isp1301.omap.o
+obj-$(CONFIG_ISP1301_OMAP) += phy-isp1301-omap.o
obj-$(CONFIG_MV_U3D_PHY) += phy-mv-u3d-usb.o
obj-$(CONFIG_NOP_USB_XCEIV) += phy-nop.o
obj-$(CONFIG_OMAP_CONTROL_USB) += phy-omap-control.o
OpenPOWER on IntegriCloud