@ -46,38 +46,39 @@
+#endif
+#endif
--- a/drivers/usb/host/pci-quirks.h
--- a/drivers/usb/host/pci-quirks.h
+++ b/drivers/usb/host/pci-quirks.h
+++ b/drivers/usb/host/pci-quirks.h
@@ -4,22 +4,30 @@
@@ -4,6 +4,9 @@
#ifdef CONFIG_PCI
#ifdef CONFIG_PCI
void uhci_reset_hc(struct pci_dev *pdev, unsigned long base);
void uhci_reset_hc(struct pci_dev *pdev, unsigned long base);
int uhci_check_and_reset_hc(struct pci_dev *pdev, unsigned long base);
int uhci_check_and_reset_hc(struct pci_dev *pdev, unsigned long base);
+void usb_enable_intel_xhci_ports(struct pci_dev *xhci_pdev);
+void usb_disable_xhci_ports(struct pci_dev *xhci_pdev);
+#else
+static inline void usb_disable_xhci_ports(struct pci_dev *xhci_pdev) {}
+#endif /* CONFIG_PCI */
+#endif /* CONFIG_PCI */
+
+
+#if defined(CONFIG_PCI) && !defined(CONFIG_PCI_DISABLE_COMMON_QUIRKS)
+#if defined(CONFIG_PCI) && !defined(CONFIG_PCI_DISABLE_COMMON_QUIRKS)
int usb_amd_find_chipset_info(void);
int usb_amd_find_chipset_info(void);
bool usb_amd_hang_symptom_quirk(void);
bool usb_amd_hang_symptom_quirk(void);
bool usb_amd_prefetch_quirk(void);
bool usb_amd_prefetch_quirk(void);
void usb_amd_dev_put(void);
@@ -15,11 +18,24 @@ void usb_disable_xhci_ports(struct pci_d
void usb_amd_quirk_pll_disable(void);
void usb_amd_quirk_pll_enable(void);
-void usb_enable_intel_xhci_ports(struct pci_dev *xhci_pdev);
-void usb_disable_xhci_ports(struct pci_dev *xhci_pdev);
void sb800_prefetch(struct device *dev, int on);
void sb800_prefetch(struct device *dev, int on);
#else
#else
struct pci_dev;
struct pci_dev;
+static inline int usb_amd_find_chipset_info(void)
+static inline int usb_amd_find_chipset_info(void)
+{
+{
+ return 0;
+ return 0;
+}
+static inline bool usb_amd_hang_symptom_quirk(void)
+{
+ return false;
+}
+static inline bool usb_amd_prefetch_quirk(void)
+{
+ return false;
+}
+}
static inline void usb_amd_quirk_pll_disable(void) {}
static inline void usb_amd_quirk_pll_disable(void) {}
static inline void usb_amd_quirk_pll_enable(void) {}
static inline void usb_amd_quirk_pll_enable(void) {}
static inline void usb_amd_dev_put(void) {}
static inline void usb_amd_dev_put(void) {}
-static inline void usb_disable_xhci_ports(struct pci_dev *xhci_pdev) {}
static inline void usb_disable_xhci_ports(struct pci_dev *xhci_pdev) {}
static inline void sb800_prefetch(struct device *dev, int on) {}
static inline void sb800_prefetch(struct device *dev, int on) {}
-#endif /* CONFIG_PCI */
-#endif /* CONFIG_PCI */
+static inline void usb_enable_intel_xhci_ports(struct pci_dev *xhci_pdev) {}
+#endif
+#endif
#endif /* __LINUX_USB_PCI_QUIRKS_H */
#endif /* __LINUX_USB_PCI_QUIRKS_H */