From d367ee64e446cedaa1dc69c93c13fe6272fe4696 Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <arnd@arndb.de>
Date: Thu, 25 Apr 2013 19:29:03 +0200
Subject: [PATCH] --- yaml --- r: 364899 b: refs/heads/master c:
 c3c683ead3c53c0eb67b72c54e130baf45ac25d2 h: refs/heads/master i:   364897:
 94341b406b64c0b135eea7f33783a75c08663660   364895:
 b11c860beff3105bf13304d4a8c5988ff4c35876 v: v3

---
 [refs]                                 | 2 +-
 trunk/arch/arm/configs/omap1_defconfig | 1 +
 trunk/drivers/usb/gadget/Kconfig       | 1 +
 trunk/drivers/usb/phy/Makefile         | 2 +-
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 4092ebe6fd54..95ddcf40a282 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 64e98a7981fbf31ea955d9cec3b6ac52717c6f8a
+refs/heads/master: c3c683ead3c53c0eb67b72c54e130baf45ac25d2
diff --git a/trunk/arch/arm/configs/omap1_defconfig b/trunk/arch/arm/configs/omap1_defconfig
index 42eab9a2a0fd..7e0ebb64a7f9 100644
--- a/trunk/arch/arm/configs/omap1_defconfig
+++ b/trunk/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
diff --git a/trunk/drivers/usb/gadget/Kconfig b/trunk/drivers/usb/gadget/Kconfig
index f85b427f4c92..83300d94a893 100644
--- a/trunk/drivers/usb/gadget/Kconfig
+++ b/trunk/drivers/usb/gadget/Kconfig
@@ -196,6 +196,7 @@ config USB_FUSB300
 config USB_OMAP
 	tristate "OMAP USB Device Controller"
 	depends on ARCH_OMAP1
+	depends on USB_PHY
 	select ISP1301_OMAP if MACH_OMAP_H2 || MACH_OMAP_H3 || MACH_OMAP_H4_OTG
 	help
 	   Many Texas Instruments OMAP processors have flexible full
diff --git a/trunk/drivers/usb/phy/Makefile b/trunk/drivers/usb/phy/Makefile
index 33863c09f3dc..a9169cb1e6fc 100644
--- a/trunk/drivers/usb/phy/Makefile
+++ b/trunk/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