diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2011-02-28 01:20:49 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2011-02-28 01:20:49 +0000 |
| commit | 209f49313e7a9c0602842fd360835adcccb5a3e7 (patch) | |
| tree | 04582e39ac3efca27e5beb87e308eb88b6078391 /target/linux/generic | |
| parent | 36cf66d06793c50079ddafa7e2c43e47ab1f3cbf (diff) | |
| download | upstream-209f49313e7a9c0602842fd360835adcccb5a3e7.tar.gz upstream-209f49313e7a9c0602842fd360835adcccb5a3e7.tar.bz2 upstream-209f49313e7a9c0602842fd360835adcccb5a3e7.zip | |
kernel: the usb pci quirks removal patch was a bit overzealous, leave in some functions referenced from other modules
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@25785 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic')
| -rw-r--r-- | target/linux/generic/patches-2.6.37/031-pci_disable_usb_common_quirks.patch | 28 | ||||
| -rw-r--r-- | target/linux/generic/patches-2.6.38/031-pci_disable_usb_common_quirks.patch | 28 |
2 files changed, 34 insertions, 22 deletions
diff --git a/target/linux/generic/patches-2.6.37/031-pci_disable_usb_common_quirks.patch b/target/linux/generic/patches-2.6.37/031-pci_disable_usb_common_quirks.patch index 49954bb567..e1efe9cc39 100644 --- a/target/linux/generic/patches-2.6.37/031-pci_disable_usb_common_quirks.patch +++ b/target/linux/generic/patches-2.6.37/031-pci_disable_usb_common_quirks.patch @@ -1,12 +1,18 @@ ---- a/drivers/usb/host/Makefile -+++ b/drivers/usb/host/Makefile -@@ -16,7 +16,9 @@ xhci-hcd-y += xhci-ring.o xhci-hub.o xhc + +--- a/drivers/usb/host/pci-quirks.c ++++ b/drivers/usb/host/pci-quirks.c +@@ -134,6 +134,8 @@ reset_needed: + } + EXPORT_SYMBOL_GPL(uhci_check_and_reset_hc); - obj-$(CONFIG_USB_WHCI_HCD) += whci/ - -+ifndef CONFIG_PCI_DISABLE_COMMON_QUIRKS - obj-$(CONFIG_PCI) += pci-quirks.o -+endif - - obj-$(CONFIG_USB_EHCI_HCD) += ehci-hcd.o - obj-$(CONFIG_USB_OXU210HP_HCD) += oxu210hp-hcd.o ++#ifndef CONFIG_PCI_DISABLE_COMMON_QUIRKS ++ + static inline int io_type_enabled(struct pci_dev *pdev, unsigned int mask) + { + u16 cmd; +@@ -478,3 +480,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 diff --git a/target/linux/generic/patches-2.6.38/031-pci_disable_usb_common_quirks.patch b/target/linux/generic/patches-2.6.38/031-pci_disable_usb_common_quirks.patch index 49954bb567..e1efe9cc39 100644 --- a/target/linux/generic/patches-2.6.38/031-pci_disable_usb_common_quirks.patch +++ b/target/linux/generic/patches-2.6.38/031-pci_disable_usb_common_quirks.patch @@ -1,12 +1,18 @@ ---- a/drivers/usb/host/Makefile -+++ b/drivers/usb/host/Makefile -@@ -16,7 +16,9 @@ xhci-hcd-y += xhci-ring.o xhci-hub.o xhc + +--- a/drivers/usb/host/pci-quirks.c ++++ b/drivers/usb/host/pci-quirks.c +@@ -134,6 +134,8 @@ reset_needed: + } + EXPORT_SYMBOL_GPL(uhci_check_and_reset_hc); - obj-$(CONFIG_USB_WHCI_HCD) += whci/ - -+ifndef CONFIG_PCI_DISABLE_COMMON_QUIRKS - obj-$(CONFIG_PCI) += pci-quirks.o -+endif - - obj-$(CONFIG_USB_EHCI_HCD) += ehci-hcd.o - obj-$(CONFIG_USB_OXU210HP_HCD) += oxu210hp-hcd.o ++#ifndef CONFIG_PCI_DISABLE_COMMON_QUIRKS ++ + static inline int io_type_enabled(struct pci_dev *pdev, unsigned int mask) + { + u16 cmd; +@@ -478,3 +480,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 |