summaryrefslogtreecommitdiffstats
path: root/drivers/usb/host/ehci-fsl.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-09-23 13:24:10 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-09-23 13:24:10 -0700
commitdc4fea795bf7e3f80dbfa3a40b8ab89427e9aed5 (patch)
tree1926c96f145965c393a2c8ab523c327dd1a241cf /drivers/usb/host/ehci-fsl.c
parentc8f2efc8f636506e0f0c2ba4035382076875f0c1 (diff)
parent9d23108df359e572a0dca0b631bfee9f5e0fa9ea (diff)
downloadlinux-dc4fea795bf7e3f80dbfa3a40b8ab89427e9aed5.tar.bz2
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-fsl.c')
-rw-r--r--drivers/usb/host/ehci-fsl.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/host/ehci-fsl.c b/drivers/usb/host/ehci-fsl.c
index e41cfdc9bf93..848fc46ad80c 100644
--- a/drivers/usb/host/ehci-fsl.c
+++ b/drivers/usb/host/ehci-fsl.c
@@ -669,7 +669,7 @@ static const struct hc_driver ehci_fsl_hc_driver = {
* generic hardware linkage
*/
.irq = ehci_irq,
- .flags = HCD_USB2 | HCD_MEMORY | HCD_BH,
+ .flags = HCD_USB2 | HCD_MEMORY,
/*
* basic lifecycle operations