KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

kernel/3.10: update pci_disable_usb_common_quirks patch

Browse source 
Fix build errors caused by undefined 'usb_disable_xhci_ports'
symbol.

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

SVN-Revision: 39369
This commit is contained in:
Gabor Juhos 2014-01-23 09:07:49 +00:00
parent 53512a1961
commit bbe086873a
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
target/linux/generic/patches-3.10/811-pci_disable_usb_common_quirks.patch
View file

@ -43,28 +43,22 @@
} }
DECLARE_PCI_FIXUP_CLASS_FINAL(PCI_ANY_ID, PCI_ANY_ID, DECLARE_PCI_FIXUP_CLASS_FINAL(PCI_ANY_ID, PCI_ANY_ID,
PCI_CLASS_SERIAL_USB, 8, quirk_usb_early_handoff); PCI_CLASS_SERIAL_USB, 8, quirk_usb_early_handoff);
+#endif +#endif /* CONFIG_PCI_DISABLE_COMMON_QUIRKS */
--- 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,18 +4,26 @@ @@ -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);
+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 */ +#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);
void usb_amd_dev_put(void); void usb_amd_dev_put(void);
void usb_amd_quirk_pll_disable(void); void usb_amd_quirk_pll_disable(void);
void usb_amd_quirk_pll_enable(void); @@ -12,10 +15,20 @@ bool usb_is_intel_switchable_xhci(struct
-bool usb_is_intel_switchable_xhci(struct pci_dev *pdev); void usb_enable_xhci_ports(struct pci_dev *xhci_pdev);
-void usb_enable_xhci_ports(struct pci_dev *xhci_pdev); void usb_disable_xhci_ports(struct pci_dev *xhci_pdev);
-void usb_disable_xhci_ports(struct pci_dev *xhci_pdev);
#else #else
+static inline int usb_amd_find_chipset_info(void) +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_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 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 /* CONFIG_PCI */
+#endif +#endif