diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2014-01-23 09:07:49 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2014-01-23 09:07:49 +0000 |
| commit | bbe086873af4f7bcb3bd353f36abb7a949dca089 (patch) | |
| tree | 4bf501046e1fcb1b2a61a52b87a82dd62919f14d | |
| parent | 53512a19610cec1248fddbc8c2d6896f33e29a9f (diff) | |
| download | mtk-20170518-bbe086873af4f7bcb3bd353f36abb7a949dca089.zip mtk-20170518-bbe086873af4f7bcb3bd353f36abb7a949dca089.tar.gz mtk-20170518-bbe086873af4f7bcb3bd353f36abb7a949dca089.tar.bz2 | |
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
| -rw-r--r-- | target/linux/generic/patches-3.10/811-pci_disable_usb_common_quirks.patch | 24 |
1 files changed, 12 insertions, 12 deletions
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 1486e0d..59eb97b 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 |