aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2012-08-15 13:26:51 +0000
committerGabor Juhos <juhosg@openwrt.org>2012-08-15 13:26:51 +0000
commit5d84dabf0fb4aea693b9522c84d951a6e7da8740 (patch)
treed738532623e0edaffab2d36876fa7b044e547438
parent76954dc8b0f262ec1c247e690c67e3a8d752e3ac (diff)
downloadupstream-5d84dabf0fb4aea693b9522c84d951a6e7da8740.tar.gz
upstream-5d84dabf0fb4aea693b9522c84d951a6e7da8740.tar.bz2
upstream-5d84dabf0fb4aea693b9522c84d951a6e7da8740.zip
generic: extend pci_isable_usb_common_quirks patch
Fixes the following build error: SYSMAP System.map Building modules, stage 2. MODPOST 48 modules ERROR: "usb_enable_xhci_ports" [drivers/usb/host/ehci-hcd.ko] undefined! ERROR: "usb_is_intel_switchable_xhci" [drivers/usb/host/ehci-hcd.ko] undefined! make[6]: *** [__modpost] Error 1 make[5]: *** [modules] Error 2 SVN-Revision: 33193
-rw-r--r--target/linux/generic/patches-3.3/811-pci_disable_usb_common_quirks.patch20
1 files changed, 20 insertions, 0 deletions
diff --git a/target/linux/generic/patches-3.3/811-pci_disable_usb_common_quirks.patch b/target/linux/generic/patches-3.3/811-pci_disable_usb_common_quirks.patch
index ce50afa8e4..7bf8eaf1e1 100644
--- a/target/linux/generic/patches-3.3/811-pci_disable_usb_common_quirks.patch
+++ b/target/linux/generic/patches-3.3/811-pci_disable_usb_common_quirks.patch
@@ -16,3 +16,23 @@
DECLARE_PCI_FIXUP_FINAL(PCI_ANY_ID, PCI_ANY_ID, quirk_usb_early_handoff);
+
+#endif
+--- a/drivers/usb/host/pci-quirks.h
++++ b/drivers/usb/host/pci-quirks.h
+@@ -8,9 +8,17 @@ int usb_amd_find_chipset_info(void);
+ void usb_amd_dev_put(void);
+ void usb_amd_quirk_pll_disable(void);
+ void usb_amd_quirk_pll_enable(void);
++#if !defined(CONFIG_PCI_DISABLE_COMMON_QUIRKS)
+ bool usb_is_intel_switchable_xhci(struct pci_dev *pdev);
+ void usb_enable_xhci_ports(struct pci_dev *xhci_pdev);
+ #else
++static inline bool usb_is_intel_switchable_xhci(struct pci_dev *pdev)
++{
++ return false;
++}
++static inline void usb_enable_xhci_ports(struct pci_dev *xhci_pdev) {}
++#endif
++#else
+ static inline void usb_amd_quirk_pll_disable(void) {}
+ static inline void usb_amd_quirk_pll_enable(void) {}
+ static inline void usb_amd_dev_put(void) {}