diff options
| author | Greg Kroah-Hartman | 2013-09-23 22:24:10 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2013-09-23 22:24:10 +0200 |
| commit | dc4fea795bf7e3f80dbfa3a40b8ab89427e9aed5 (patch) | |
| tree | 1926c96f145965c393a2c8ab523c327dd1a241cf /drivers/usb/host/ehci-ppc-of.c | |
| parent | usbcore: fix read of usbdevfs_ctrltransfer fields in proc_control() (diff) | |
| parent | Merge tag 'staging-3.12-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff) | |
| download | kernel-qcow2-linux-dc4fea795bf7e3f80dbfa3a40b8ab89427e9aed5.tar.gz kernel-qcow2-linux-dc4fea795bf7e3f80dbfa3a40b8ab89427e9aed5.tar.xz kernel-qcow2-linux-dc4fea795bf7e3f80dbfa3a40b8ab89427e9aed5.zip | |
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-ppc-of.c')
| -rw-r--r-- | drivers/usb/host/ehci-ppc-of.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/host/ehci-ppc-of.c b/drivers/usb/host/ehci-ppc-of.c index 6cc5567bf9c8..932293fa32de 100644 --- a/drivers/usb/host/ehci-ppc-of.c +++ b/drivers/usb/host/ehci-ppc-of.c @@ -28,7 +28,7 @@ static const struct hc_driver ehci_ppc_of_hc_driver = { * generic hardware linkage */ .irq = ehci_irq, - .flags = HCD_MEMORY | HCD_USB2 | HCD_BH, + .flags = HCD_MEMORY | HCD_USB2, /* * basic lifecycle operations |