From: Gabor Juhos <juhosg@openwrt.org>
Date: Thu, 23 Jan 2014 09:07:49 +0000 (+0000)
Subject: kernel/3.10: update pci_disable_usb_common_quirks patch
X-Git-Tag: reboot~8101
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=bbe086873af4f7bcb3bd353f36abb7a949dca089;p=openwrt%2Fopenwrt.git

kernel/3.10: update pci_disable_usb_common_quirks patch

Fix build errors caused by undefined 'usb_disable_xhci_ports'
symbol.

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 39369
---

diff --git a/target/linux/generic/patches-3.10/811-pci_disable_usb_common_quirks.patch b/target/linux/generic/patches-3.10/811-pci_disable_usb_common_quirks.patch
index 1486e0df46..59eb97bbcf 100644
--- a/target/linux/generic/patches-3.10/811-pci_disable_usb_common_quirks.patch
+++ b/target/linux/generic/patches-3.10/811-pci_disable_usb_common_quirks.patch
@@ -43,28 +43,22 @@
  }
  DECLARE_PCI_FIXUP_CLASS_FINAL(PCI_ANY_ID, PCI_ANY_ID,
  			PCI_CLASS_SERIAL_USB, 8, quirk_usb_early_handoff);
-+#endif
++#endif /* CONFIG_PCI_DISABLE_COMMON_QUIRKS */
 --- a/drivers/usb/host/pci-quirks.h
 +++ b/drivers/usb/host/pci-quirks.h
-@@ -4,18 +4,26 @@
+@@ -4,6 +4,9 @@
  #ifdef CONFIG_PCI
  void uhci_reset_hc(struct pci_dev *pdev, unsigned long base);
  int uhci_check_and_reset_hc(struct pci_dev *pdev, unsigned long base);
-+bool usb_is_intel_switchable_xhci(struct pci_dev *pdev);
-+void usb_enable_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 */
 +
 +#if defined(CONFIG_PCI) && !defined(CONFIG_PCI_DISABLE_COMMON_QUIRKS)
  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);
--bool usb_is_intel_switchable_xhci(struct pci_dev *pdev);
--void usb_enable_xhci_ports(struct pci_dev *xhci_pdev);
--void usb_disable_xhci_ports(struct pci_dev *xhci_pdev);
+@@ -12,10 +15,20 @@ bool usb_is_intel_switchable_xhci(struct
+ void usb_enable_xhci_ports(struct pci_dev *xhci_pdev);
+ void usb_disable_xhci_ports(struct pci_dev *xhci_pdev);
  #else
 +static inline int usb_amd_find_chipset_info(void)
 +{
@@ -73,7 +67,13 @@
  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) {}
--static inline void usb_disable_xhci_ports(struct pci_dev *xhci_pdev) {}
++
++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) {}
+ static inline void usb_disable_xhci_ports(struct pci_dev *xhci_pdev) {}
 -#endif  /* CONFIG_PCI */
 +#endif