summaryrefslogtreecommitdiff
path: root/drivers/usb/phy/phy-fsl-usb.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-08-25 12:43:44 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-08-25 12:43:44 -0700
commit5e25e4f304ce53004dcd01725938c0bc45c75d35 (patch)
tree16148e0ffcca471d0acf20fa7c9410e8c7704519 /drivers/usb/phy/phy-fsl-usb.h
parent1b4757ee6f47502ca82782d270ccdc1caac8fc8e (diff)
parent52d5b9aba1f5790ca3231c262979c2c3e26dd99b (diff)
downloadlinux-sh-5e25e4f304ce53004dcd01725938c0bc45c75d35.tar.gz
Merge tag 'usb-3.11-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb
Pull USB fixes from Greg KH: "Here are two USB fixes for 3.11-rc7 One fixes a reported regression in the OHCI driver, and the other fixes a reported build breakage in the USB phy drivers" * tag 'usb-3.11-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: usb: phy: fix build breakage USB: OHCI: add missing PCI PM callbacks to ohci-pci.c
Diffstat (limited to 'drivers/usb/phy/phy-fsl-usb.h')
-rw-r--r--drivers/usb/phy/phy-fsl-usb.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/phy/phy-fsl-usb.h b/drivers/usb/phy/phy-fsl-usb.h
index ca266280895d..e1859b8ef567 100644
--- a/drivers/usb/phy/phy-fsl-usb.h
+++ b/drivers/usb/phy/phy-fsl-usb.h
@@ -15,7 +15,7 @@
* 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include "otg_fsm.h"
+#include "phy-fsm-usb.h"
#include <linux/usb/otg.h>
#include <linux/ioctl.h>