diff options
| author | Mark Brown <broonie@linaro.org> | 2013-08-29 18:40:17 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-08-29 18:40:17 +0100 |
| commit | 965abff8d8accdffc4af1b11fcf580e83031330a (patch) | |
| tree | ae81d9fa54daf543115f4bb791367b94707ee0ae /drivers/usb/phy/phy-fsm-usb.c | |
| parent | f04d4ffdd38dff05670ae34ca334276828012180 (diff) | |
| parent | 8bf3379a74bc9132751bfa685bad2da318fd59d7 (diff) | |
Merge tag 'v3.10.10' into linux-linaro-lsk
This is the 3.10.10 stable release
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) |