diff options
| author | Linus Torvalds | 2013-08-25 21:43:44 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2013-08-25 21:43:44 +0200 |
| commit | 5e25e4f304ce53004dcd01725938c0bc45c75d35 (patch) | |
| tree | 16148e0ffcca471d0acf20fa7c9410e8c7704519 /drivers/usb/phy/phy-fsm-usb.c | |
| parent | Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm (diff) | |
| parent | usb: phy: fix build breakage (diff) | |
| download | kernel-qcow2-linux-5e25e4f304ce53004dcd01725938c0bc45c75d35.tar.gz kernel-qcow2-linux-5e25e4f304ce53004dcd01725938c0bc45c75d35.tar.xz kernel-qcow2-linux-5e25e4f304ce53004dcd01725938c0bc45c75d35.zip | |
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-fsm-usb.c')
| -rw-r--r-- | drivers/usb/phy/phy-fsm-usb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/phy/phy-fsm-usb.c b/drivers/usb/phy/phy-fsm-usb.c index c520b3548e7c..7f4596606e18 100644 --- a/drivers/usb/phy/phy-fsm-usb.c +++ b/drivers/usb/phy/phy-fsm-usb.c @@ -29,7 +29,7 @@ #include <linux/usb/gadget.h> #include <linux/usb/otg.h> -#include "phy-otg-fsm.h" +#include "phy-fsm-usb.h" /* Change USB protocol when there is a protocol change */ static int otg_set_protocol(struct otg_fsm *fsm, int protocol) |