diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-09-23 16:24:10 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-09-23 16:24:10 -0400 |
| commit | dc4fea795bf7e3f80dbfa3a40b8ab89427e9aed5 (patch) | |
| tree | 1926c96f145965c393a2c8ab523c327dd1a241cf /drivers/usb/host/ehci-hcd.c | |
| parent | c8f2efc8f636506e0f0c2ba4035382076875f0c1 (diff) | |
| parent | 9d23108df359e572a0dca0b631bfee9f5e0fa9ea (diff) | |
Merge branch 'master' into usb-next
We have USB fixes now in Linus's tree that we need to properly sort out
with reverts and the like in the usb-next branch, so merge them together
and do it by hand.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/host/ehci-hcd.c')
| -rw-r--r-- | drivers/usb/host/ehci-hcd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c index 5d6022f30ebe..86ab9fd9fe9e 100644 --- a/drivers/usb/host/ehci-hcd.c +++ b/drivers/usb/host/ehci-hcd.c | |||
| @@ -1158,7 +1158,7 @@ static const struct hc_driver ehci_hc_driver = { | |||
| 1158 | * generic hardware linkage | 1158 | * generic hardware linkage |
| 1159 | */ | 1159 | */ |
| 1160 | .irq = ehci_irq, | 1160 | .irq = ehci_irq, |
| 1161 | .flags = HCD_MEMORY | HCD_USB2 | HCD_BH, | 1161 | .flags = HCD_MEMORY | HCD_USB2, |
| 1162 | 1162 | ||
| 1163 | /* | 1163 | /* |
| 1164 | * basic lifecycle operations | 1164 | * basic lifecycle operations |