summaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.1/811-pci_disable_usb_common_quirks.patch
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2011-08-09 12:19:43 +0000
committerJonas Gorski <jogo@openwrt.org>2011-08-09 12:19:43 +0000
commitcf2070bd5b394d5c3fcfae577bd623a6e8a7f0c4 (patch)
treef0d9e62c746434dde7a45ed0debd3eb94b92dc65 /target/linux/generic/patches-3.1/811-pci_disable_usb_common_quirks.patch
parenta5f2fd63598414246a497e08a4433a0116f2f606 (diff)
downloadmaster-31e0f0ae-cf2070bd5b394d5c3fcfae577bd623a6e8a7f0c4.tar.gz
master-31e0f0ae-cf2070bd5b394d5c3fcfae577bd623a6e8a7f0c4.tar.bz2
master-31e0f0ae-cf2070bd5b394d5c3fcfae577bd623a6e8a7f0c4.zip
linux: generic: add support for 3.1-rc1
SVN-Revision: 27940
Diffstat (limited to 'target/linux/generic/patches-3.1/811-pci_disable_usb_common_quirks.patch')
-rw-r--r--target/linux/generic/patches-3.1/811-pci_disable_usb_common_quirks.patch18
1 files changed, 18 insertions, 0 deletions
diff --git a/target/linux/generic/patches-3.1/811-pci_disable_usb_common_quirks.patch b/target/linux/generic/patches-3.1/811-pci_disable_usb_common_quirks.patch
new file mode 100644
index 0000000000..3bbadd42a8
--- /dev/null
+++ b/target/linux/generic/patches-3.1/811-pci_disable_usb_common_quirks.patch
@@ -0,0 +1,18 @@
+
+--- a/drivers/usb/host/pci-quirks.c
++++ b/drivers/usb/host/pci-quirks.c
+@@ -429,6 +429,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;
+@@ -883,3 +885,5 @@ static void __devinit quirk_usb_early_ha
+ quirk_usb_handoff_xhci(pdev);
+ }
+ DECLARE_PCI_FIXUP_FINAL(PCI_ANY_ID, PCI_ANY_ID, quirk_usb_early_handoff);
++
++#endif