2012-02-02 08:23:54 +00:00
|
|
|
|
|
|
|
|
--- a/drivers/usb/host/pci-quirks.c
|
|
|
|
|
+++ b/drivers/usb/host/pci-quirks.c
|
2012-06-05 13:40:38 +00:00
|
|
|
@@ -432,6 +432,8 @@ reset_needed:
|
2012-02-02 08:23:54 +00:00
|
|
|
}
|
|
|
|
|
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;
|
2012-06-05 13:40:38 +00:00
|
|
|
@@ -928,3 +930,5 @@ static void __devinit quirk_usb_early_ha
|
2012-03-03 14:10:24 +00:00
|
|
|
pci_disable_device(pdev);
|
2012-02-02 08:23:54 +00:00
|
|
|
}
|
|
|
|
|
DECLARE_PCI_FIXUP_FINAL(PCI_ANY_ID, PCI_ANY_ID, quirk_usb_early_handoff);
|
|
|
|
|
+
|
|
|
|
|
+#endif
|
2012-08-15 13:26:51 +00:00
|
|
|
--- 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) {}
|
