Author: nbd
Date: 2014-07-17 18:44:04 +0200 (Thu, 17 Jul 2014)
New Revision: 41702
Modified:
trunk/target/linux/generic/patches-3.13/811-pci_disable_usb_common_quirks.patch
trunk/target/linux/generic/patches-3.14/811-pci_disable_usb_common_quirks.patch
Log:
kernel/3.1{3, 4}: fix AMD USB HDC wakeup quirk disabling
Declare inline placeholder when usb_hcd_amd_remote_wakeup_quirk() not
compiled due CONFIG_PCI_DISABLE_COMMON_QUIRKS.
Signed-off-by: Sergey Ryazanov <[email protected]>
Modified:
trunk/target/linux/generic/patches-3.13/811-pci_disable_usb_common_quirks.patch
===================================================================
---
trunk/target/linux/generic/patches-3.13/811-pci_disable_usb_common_quirks.patch
2014-07-17 16:36:55 UTC (rev 41701)
+++
trunk/target/linux/generic/patches-3.13/811-pci_disable_usb_common_quirks.patch
2014-07-17 16:44:04 UTC (rev 41702)
@@ -82,3 +82,20 @@
+#endif
#endif /* __LINUX_USB_PCI_QUIRKS_H */
+--- a/include/linux/usb/hcd.h
++++ b/include/linux/usb/hcd.h
+@@ -436,7 +436,14 @@ extern int usb_hcd_pci_probe(struct pci_
+ extern void usb_hcd_pci_remove(struct pci_dev *dev);
+ extern void usb_hcd_pci_shutdown(struct pci_dev *dev);
+
++#ifndef CONFIG_PCI_DISABLE_COMMON_QUIRKS
+ extern int usb_hcd_amd_remote_wakeup_quirk(struct pci_dev *dev);
++#else
++static inline int usb_hcd_amd_remote_wakeup_quirk(struct pci_dev *dev)
++{
++ return 0;
++}
++#endif
+
+ #ifdef CONFIG_PM
+ extern const struct dev_pm_ops usb_hcd_pci_pm_ops;
Modified:
trunk/target/linux/generic/patches-3.14/811-pci_disable_usb_common_quirks.patch
===================================================================
---
trunk/target/linux/generic/patches-3.14/811-pci_disable_usb_common_quirks.patch
2014-07-17 16:36:55 UTC (rev 41701)
+++
trunk/target/linux/generic/patches-3.14/811-pci_disable_usb_common_quirks.patch
2014-07-17 16:44:04 UTC (rev 41702)
@@ -82,3 +82,20 @@
+#endif
#endif /* __LINUX_USB_PCI_QUIRKS_H */
+--- a/include/linux/usb/hcd.h
++++ b/include/linux/usb/hcd.h
+@@ -439,7 +439,14 @@ extern int usb_hcd_pci_probe(struct pci_
+ extern void usb_hcd_pci_remove(struct pci_dev *dev);
+ extern void usb_hcd_pci_shutdown(struct pci_dev *dev);
+
++#ifndef CONFIG_PCI_DISABLE_COMMON_QUIRKS
+ extern int usb_hcd_amd_remote_wakeup_quirk(struct pci_dev *dev);
++#else
++static inline int usb_hcd_amd_remote_wakeup_quirk(struct pci_dev *dev)
++{
++ return 0;
++}
++#endif
+
+ #ifdef CONFIG_PM
+ extern const struct dev_pm_ops usb_hcd_pci_pm_ops;
_______________________________________________
openwrt-commits mailing list
[email protected]
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
