1
0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-28 01:43:10 +02:00
openwrt-xburst/target/linux/generic/patches-3.3/811-pci_disable_usb_common_quirks.patch
juhosg 8c9a05c907 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

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33193 3c298f89-4303-0410-b956-a3cf2f4a3e73
2012-08-15 13:26:51 +00:00

39 lines
1.2 KiB
Diff

--- a/drivers/usb/host/pci-quirks.c
+++ b/drivers/usb/host/pci-quirks.c
@@ -432,6 +432,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;
@@ -928,3 +930,5 @@ static void __devinit quirk_usb_early_ha
pci_disable_device(pdev);
}
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) {}