aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.7/811-pci_disable_usb_common_quirks.patch
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2012-11-18 18:52:38 +0000
committerImre Kaloz <kaloz@openwrt.org>2012-11-18 18:52:38 +0000
commit43d2eb64ccb3a223ba2244faee1280aaa6f68d11 (patch)
tree86525769ccc1e76c33de9d10b51d14bdc0e1c8f7 /target/linux/generic/patches-3.7/811-pci_disable_usb_common_quirks.patch
parent2b0cba675561342a1a538bad8a7df10cf855323e (diff)
downloadupstream-43d2eb64ccb3a223ba2244faee1280aaa6f68d11.tar.gz
upstream-43d2eb64ccb3a223ba2244faee1280aaa6f68d11.tar.bz2
upstream-43d2eb64ccb3a223ba2244faee1280aaa6f68d11.zip
[generic]: add 3.7-rc6 support (patch 820 still has to be fixed)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34247 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.7/811-pci_disable_usb_common_quirks.patch')
-rw-r--r--target/linux/generic/patches-3.7/811-pci_disable_usb_common_quirks.patch17
1 files changed, 17 insertions, 0 deletions
diff --git a/target/linux/generic/patches-3.7/811-pci_disable_usb_common_quirks.patch b/target/linux/generic/patches-3.7/811-pci_disable_usb_common_quirks.patch
new file mode 100644
index 0000000000..abe0230fd3
--- /dev/null
+++ b/target/linux/generic/patches-3.7/811-pci_disable_usb_common_quirks.patch
@@ -0,0 +1,17 @@
+
+--- a/drivers/usb/host/pci-quirks.c
++++ b/drivers/usb/host/pci-quirks.c
+@@ -434,6 +434,8 @@ reset_needed:
+ }
+ EXPORT_SYMBOL_GPL(uhci_check_and_reset_hc);
+
++#ifndef CONFIG_PCI_DISABLE_COMMON_QUIRKS
++
+ static inline int io_type_enabled(struct pci_dev *pdev, unsigned int mask)
+ {
+ u16 cmd;
+@@ -971,3 +973,4 @@ static void __devinit quirk_usb_early_ha
+ }
+ DECLARE_PCI_FIXUP_CLASS_FINAL(PCI_ANY_ID, PCI_ANY_ID,
+ PCI_CLASS_SERIAL_USB, 8, quirk_usb_early_handoff);
++#endif