diff options
| author | Mark Brown <broonie@linaro.org> | 2013-10-07 06:46:56 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-10-07 06:46:56 -0400 |
| commit | 9f9e4266a66b6f9dcde305e85035615c06bdb7f7 (patch) | |
| tree | c6f867c7a1bf94a3b4f13b19a9ce442c7aec9e79 /drivers/usb/host/ehci-octeon.c | |
| parent | bf551413038f74343ec4d1413c3610e2362d0aeb (diff) | |
| parent | 249ce1387b7739dbea2ac1a697e4bf1e37ec06b7 (diff) | |
Merge remote-tracking branch 'asoc/topic/dapm' into asoc-twl6040
Diffstat (limited to 'drivers/usb/host/ehci-octeon.c')
| -rw-r--r-- | drivers/usb/host/ehci-octeon.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/host/ehci-octeon.c b/drivers/usb/host/ehci-octeon.c index ab0397e4d8f3..45cc00158412 100644 --- a/drivers/usb/host/ehci-octeon.c +++ b/drivers/usb/host/ehci-octeon.c | |||
| @@ -51,7 +51,7 @@ static const struct hc_driver ehci_octeon_hc_driver = { | |||
| 51 | * generic hardware linkage | 51 | * generic hardware linkage |
| 52 | */ | 52 | */ |
| 53 | .irq = ehci_irq, | 53 | .irq = ehci_irq, |
| 54 | .flags = HCD_MEMORY | HCD_USB2 | HCD_BH, | 54 | .flags = HCD_MEMORY | HCD_USB2, |
| 55 | 55 | ||
| 56 | /* | 56 | /* |
| 57 | * basic lifecycle operations | 57 | * basic lifecycle operations |