aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2014-01-25 08:25:05 +0000
committerGabor Juhos <juhosg@openwrt.org>2014-01-25 08:25:05 +0000
commitfca9b2b99ccf8d4b59edf3b0cd5a0457384f2874 (patch)
treec105a41f6185f7400e9686b6028fe7961a618a3b
parent4ce8df74743ef0be0c834cecbfd4671105e15faa (diff)
downloadupstream-fca9b2b99ccf8d4b59edf3b0cd5a0457384f2874.tar.gz
upstream-fca9b2b99ccf8d4b59edf3b0cd5a0457384f2874.tar.bz2
upstream-fca9b2b99ccf8d4b59edf3b0cd5a0457384f2874.zip
kernel/3.8: 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> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39393 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--target/linux/generic/patches-3.8/811-pci_disable_usb_common_quirks.patch24
1 files changed, 12 insertions, 12 deletions
diff --git a/target/linux/generic/patches-3.8/811-pci_disable_usb_common_quirks.patch b/target/linux/generic/patches-3.8/811-pci_disable_usb_common_quirks.patch
index 1486e0df46..59eb97bbcf 100644
--- a/target/linux/generic/patches-3.8/811-pci_disable_usb_common_quirks.patch
+++ b/target/linux/generic/patches-3.8/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