aboutsummaryrefslogtreecommitdiffstats
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
commitf8c7d2d540cb3ef04ea077a54ab40032f2a50976 (patch)
treecc4ae0400759c09d1eb08510f89711899bf63bce /target/linux/generic/patches-3.1/811-pci_disable_usb_common_quirks.patch
parentc025c5e99da524b1bb8fc9bdf00836f4e7402d96 (diff)
downloadmaster-187ad058-f8c7d2d540cb3ef04ea077a54ab40032f2a50976.tar.gz
master-187ad058-f8c7d2d540cb3ef04ea077a54ab40032f2a50976.tar.bz2
master-187ad058-f8c7d2d540cb3ef04ea077a54ab40032f2a50976.zip
linux: generic: add support for 3.1-rc1
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27940 3c298f89-4303-0410-b956-a3cf2f4a3e73
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