26 files changed, 25 insertions, 25 deletions

diff --git a/drivers/usb/phy/Makefile b/drivers/usb/phy/Makefile
index d10a8b387ffe..5fb4a5d55945 100644
--- a/drivers/usb/phy/Makefile
+++ b/drivers/usb/phy/Makefile
@@ -8,24 +8,24 @@ obj-$(CONFIG_USB_PHY)			+= phy.o
 
 # transceiver drivers, keep the list sorted
 
-obj-$(CONFIG_AB8500_USB)                += ab8500-usb.o
-fsl_usb2_otg-objs                       := fsl_otg.o otg_fsm.o
-obj-$(CONFIG_FSL_USB2_OTG)              += fsl_usb2_otg.o
-obj-$(CONFIG_ISP1301_OMAP)              += isp1301_omap.o
-obj-$(CONFIG_MV_U3D_PHY)                += mv_u3d_phy.o
-obj-$(CONFIG_NOP_USB_XCEIV)             += nop-usb-xceiv.o
-obj-$(CONFIG_OMAP_CONTROL_USB)          += omap-control-usb.o
-obj-$(CONFIG_OMAP_USB2)                 += omap-usb2.o
-obj-$(CONFIG_OMAP_USB3)                 += omap-usb3.o
-obj-$(CONFIG_SAMSUNG_USBPHY)            += samsung-usbphy.o
-obj-$(CONFIG_TWL4030_USB)               += twl4030-usb.o
-obj-$(CONFIG_TWL6030_USB)               += twl6030-usb.o
-obj-$(CONFIG_USB_EHCI_TEGRA)            += tegra_usb_phy.o
-obj-$(CONFIG_USB_GPIO_VBUS)             += gpio_vbus.o
-obj-$(CONFIG_USB_ISP1301)               += isp1301.o
-obj-$(CONFIG_USB_MSM_OTG)               += msm_otg.o
-obj-$(CONFIG_USB_MV_OTG)                += mv_otg.o
-obj-$(CONFIG_USB_MXS_PHY)               += mxs-phy.o
-obj-$(CONFIG_USB_RCAR_PHY)              += rcar-phy.o
-obj-$(CONFIG_USB_ULPI)                  += ulpi.o
-obj-$(CONFIG_USB_ULPI_VIEWPORT)         += ulpi_viewport.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_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
+obj-$(CONFIG_OMAP_USB2)                 += phy-omap-usb2.o
+obj-$(CONFIG_OMAP_USB3)                 += phy-omap-usb3.o
+obj-$(CONFIG_SAMSUNG_USBPHY)            += phy-samsung-usb.o
+obj-$(CONFIG_TWL4030_USB)               += phy-twl4030-usb.o
+obj-$(CONFIG_TWL6030_USB)               += phy-twl6030-usb.o
+obj-$(CONFIG_USB_EHCI_TEGRA)            += phy-tegra-usb.o
+obj-$(CONFIG_USB_GPIO_VBUS)             += phy-gpio-vbus-usb.o
+obj-$(CONFIG_USB_ISP1301)               += phy-isp1301.o
+obj-$(CONFIG_USB_MSM_OTG)               += phy-msm-usb.o
+obj-$(CONFIG_USB_MV_OTG)                += phy-mv-usb.o
+obj-$(CONFIG_USB_MXS_PHY)               += phy-mxs-usb.o
+obj-$(CONFIG_USB_RCAR_PHY)              += phy-rcar-usb.o
+obj-$(CONFIG_USB_ULPI)                  += phy-ulpi.o
+obj-$(CONFIG_USB_ULPI_VIEWPORT)         += phy-ulpi-viewport.o
diff --git a/drivers/usb/phy/ab8500-usb.c b/drivers/usb/phy/phy-ab8500-usb.c
index 2d86f26a0183..2d86f26a0183 100644
--- a/drivers/usb/phy/ab8500-usb.c
+++ b/drivers/usb/phy/phy-ab8500-usb.c
diff --git a/drivers/usb/phy/fsl_otg.c b/drivers/usb/phy/phy-fsl-usb.c
index 72a2a00c2487..97b9308507c3 100644
--- a/drivers/usb/phy/fsl_otg.c
+++ b/drivers/usb/phy/phy-fsl-usb.c
@@ -43,7 +43,7 @@
 
 #include <asm/unaligned.h>
 
-#include "fsl_otg.h"
+#include "phy-fsl-usb.h"
 
 #define DRIVER_VERSION "Rev. 1.55"
 #define DRIVER_AUTHOR "Jerry Huang/Li Yang"
diff --git a/drivers/usb/phy/fsl_otg.h b/drivers/usb/phy/phy-fsl-usb.h
index ca266280895d..ca266280895d 100644
--- a/drivers/usb/phy/fsl_otg.h
+++ b/drivers/usb/phy/phy-fsl-usb.h
diff --git a/drivers/usb/phy/otg_fsm.c b/drivers/usb/phy/phy-fsm-usb.c
index 1f729a15decb..c520b3548e7c 100644
--- a/drivers/usb/phy/otg_fsm.c
+++ b/drivers/usb/phy/phy-fsm-usb.c
@@ -29,7 +29,7 @@
 #include <linux/usb/gadget.h>
 #include <linux/usb/otg.h>
 
-#include "otg_fsm.h"
+#include "phy-otg-fsm.h"
 
 /* Change USB protocol when there is a protocol change */
 static int otg_set_protocol(struct otg_fsm *fsm, int protocol)
diff --git a/drivers/usb/phy/otg_fsm.h b/drivers/usb/phy/phy-fsm-usb.h
index c30a2e1d9e46..c30a2e1d9e46 100644
--- a/drivers/usb/phy/otg_fsm.h
+++ b/drivers/usb/phy/phy-fsm-usb.h
diff --git a/drivers/usb/phy/gpio_vbus.c b/drivers/usb/phy/phy-gpio-vbus-usb.c
index a7d4ac591982..a7d4ac591982 100644
--- a/drivers/usb/phy/gpio_vbus.c
+++ b/drivers/usb/phy/phy-gpio-vbus-usb.c
diff --git a/drivers/usb/phy/isp1301_omap.c b/drivers/usb/phy/phy-isp1301-omap.c
index 8fe0c3b95261..8fe0c3b95261 100644
--- a/drivers/usb/phy/isp1301_omap.c
+++ b/drivers/usb/phy/phy-isp1301-omap.c
diff --git a/drivers/usb/phy/isp1301.c b/drivers/usb/phy/phy-isp1301.c
index 18dbf7e37607..18dbf7e37607 100644
--- a/drivers/usb/phy/isp1301.c
+++ b/drivers/usb/phy/phy-isp1301.c
diff --git a/drivers/usb/phy/msm_otg.c b/drivers/usb/phy/phy-msm-usb.c
index 749fbf41fb6f..749fbf41fb6f 100644
--- a/drivers/usb/phy/msm_otg.c
+++ b/drivers/usb/phy/phy-msm-usb.c
diff --git a/drivers/usb/phy/mv_u3d_phy.c b/drivers/usb/phy/phy-mv-u3d-usb.c
index 9d8599122aa9..cb7e70f17709 100644
--- a/drivers/usb/phy/mv_u3d_phy.c
+++ b/drivers/usb/phy/phy-mv-u3d-usb.c
@@ -15,7 +15,7 @@
 #include <linux/usb/otg.h>
 #include <linux/platform_data/mv_usb.h>
 
-#include "mv_u3d_phy.h"
+#include "phy-mv-u3d-usb.h"
 
 /*
  * struct mv_u3d_phy - transceiver driver state
diff --git a/drivers/usb/phy/mv_u3d_phy.h b/drivers/usb/phy/phy-mv-u3d-usb.h
index 2a658cb9a527..2a658cb9a527 100644
--- a/drivers/usb/phy/mv_u3d_phy.h
+++ b/drivers/usb/phy/phy-mv-u3d-usb.h
diff --git a/drivers/usb/phy/mv_otg.c b/drivers/usb/phy/phy-mv-usb.c
index b6a9be31133b..6872bf0a3681 100644
--- a/drivers/usb/phy/mv_otg.c
+++ b/drivers/usb/phy/phy-mv-usb.c
@@ -27,7 +27,7 @@
 #include <linux/usb/hcd.h>
 #include <linux/platform_data/mv_usb.h>
 
-#include "mv_otg.h"
+#include "phy-mv-usb.h"
 
 #define DRIVER_DESC     "Marvell USB OTG transceiver driver"
 #define DRIVER_VERSION  "Jan 20, 2010"
diff --git a/drivers/usb/phy/mv_otg.h b/drivers/usb/phy/phy-mv-usb.h
index 8a9e351b36ba..8a9e351b36ba 100644
--- a/drivers/usb/phy/mv_otg.h
+++ b/drivers/usb/phy/phy-mv-usb.h
diff --git a/drivers/usb/phy/mxs-phy.c b/drivers/usb/phy/phy-mxs-usb.c
index 9d4381e64d51..9d4381e64d51 100644
--- a/drivers/usb/phy/mxs-phy.c
+++ b/drivers/usb/phy/phy-mxs-usb.c
diff --git a/drivers/usb/phy/nop-usb-xceiv.c b/drivers/usb/phy/phy-nop.c
index 2b10cc969bbb..2b10cc969bbb 100644
--- a/drivers/usb/phy/nop-usb-xceiv.c
+++ b/drivers/usb/phy/phy-nop.c
diff --git a/drivers/usb/phy/omap-control-usb.c b/drivers/usb/phy/phy-omap-control.c
index 1419ceda9759..1419ceda9759 100644
--- a/drivers/usb/phy/omap-control-usb.c
+++ b/drivers/usb/phy/phy-omap-control.c
diff --git a/drivers/usb/phy/omap-usb2.c b/drivers/usb/phy/phy-omap-usb2.c
index 844ab68f08d0..844ab68f08d0 100644
--- a/drivers/usb/phy/omap-usb2.c
+++ b/drivers/usb/phy/phy-omap-usb2.c
diff --git a/drivers/usb/phy/omap-usb3.c b/drivers/usb/phy/phy-omap-usb3.c
index a6e60b1e102e..a6e60b1e102e 100644
--- a/drivers/usb/phy/omap-usb3.c
+++ b/drivers/usb/phy/phy-omap-usb3.c
diff --git a/drivers/usb/phy/rcar-phy.c b/drivers/usb/phy/phy-rcar-usb.c
index a35681b0c501..a35681b0c501 100644
--- a/drivers/usb/phy/rcar-phy.c
+++ b/drivers/usb/phy/phy-rcar-usb.c
diff --git a/drivers/usb/phy/samsung-usbphy.c b/drivers/usb/phy/phy-samsung-usb.c
index 967101ec15fd..967101ec15fd 100644
--- a/drivers/usb/phy/samsung-usbphy.c
+++ b/drivers/usb/phy/phy-samsung-usb.c
diff --git a/drivers/usb/phy/tegra_usb_phy.c b/drivers/usb/phy/phy-tegra-usb.c
index 5487d38481af..5487d38481af 100644
--- a/drivers/usb/phy/tegra_usb_phy.c
+++ b/drivers/usb/phy/phy-tegra-usb.c
diff --git a/drivers/usb/phy/twl4030-usb.c b/drivers/usb/phy/phy-twl4030-usb.c
index a994715a3101..a994715a3101 100644
--- a/drivers/usb/phy/twl4030-usb.c
+++ b/drivers/usb/phy/phy-twl4030-usb.c
diff --git a/drivers/usb/phy/twl6030-usb.c b/drivers/usb/phy/phy-twl6030-usb.c
index 8cd6cf49bdbd..8cd6cf49bdbd 100644
--- a/drivers/usb/phy/twl6030-usb.c
+++ b/drivers/usb/phy/phy-twl6030-usb.c
diff --git a/drivers/usb/phy/ulpi_viewport.c b/drivers/usb/phy/phy-ulpi-viewport.c
index c5ba7e5423fc..c5ba7e5423fc 100644
--- a/drivers/usb/phy/ulpi_viewport.c
+++ b/drivers/usb/phy/phy-ulpi-viewport.c
diff --git a/drivers/usb/phy/ulpi.c b/drivers/usb/phy/phy-ulpi.c
index 217339dd7a90..217339dd7a90 100644
--- a/drivers/usb/phy/ulpi.c
+++ b/drivers/usb/phy/phy-ulpi.c