diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2012-12-14 08:32:56 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2012-12-14 08:32:56 +0000 |
| commit | 272ef8ac00065906c8b67843c7424fa190a8beda (patch) | |
| tree | 9d56388024885704c2d9a0649dba054459480f5b | |
| parent | 2e2c88b625fbb9290b0e7165ef7b2ac5eaef2a80 (diff) | |
| download | master-31e0f0ae-272ef8ac00065906c8b67843c7424fa190a8beda.tar.gz master-31e0f0ae-272ef8ac00065906c8b67843c7424fa190a8beda.tar.bz2 master-31e0f0ae-272ef8ac00065906c8b67843c7424fa190a8beda.zip | |
generic: update pci_disable_usb_common_quirks patch
Fixes the following compiler warning:
drivers/usb/host/pci-quirks.c:459:23: warning: 'quirk_usb_handoff_uhci' defined but not used [-Wunused-function]
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 34675
| -rw-r--r-- | target/linux/generic/patches-3.6/811-pci_disable_usb_common_quirks.patch | 14 | ||||
| -rw-r--r-- | target/linux/generic/patches-3.7/811-pci_disable_usb_common_quirks.patch | 11 |
2 files changed, 7 insertions, 18 deletions
diff --git a/target/linux/generic/patches-3.6/811-pci_disable_usb_common_quirks.patch b/target/linux/generic/patches-3.6/811-pci_disable_usb_common_quirks.patch index 384c7f8cc4..271e53db50 100644 --- a/target/linux/generic/patches-3.6/811-pci_disable_usb_common_quirks.patch +++ b/target/linux/generic/patches-3.6/811-pci_disable_usb_common_quirks.patch @@ -21,7 +21,7 @@ /* * Make sure the controller is completely inactive, unable to * generate interrupts or do DMA. -@@ -432,6 +438,13 @@ reset_needed: +@@ -432,8 +438,16 @@ reset_needed: uhci_reset_hc(pdev, base); return 1; } @@ -34,17 +34,11 @@ +#endif EXPORT_SYMBOL_GPL(uhci_check_and_reset_hc); - static inline int io_type_enabled(struct pci_dev *pdev, unsigned int mask) -@@ -461,6 +474,8 @@ static void __devinit quirk_usb_handoff_ - uhci_check_and_reset_hc(pdev, base); - } - +#ifndef CONFIG_PCI_DISABLE_COMMON_QUIRKS -+ - static int __devinit mmio_resource_enabled(struct pci_dev *pdev, int idx) + static inline int io_type_enabled(struct pci_dev *pdev, unsigned int mask) { - return pci_resource_start(pdev, idx) && mmio_enabled(pdev); -@@ -971,3 +986,4 @@ static void __devinit quirk_usb_early_ha + u16 cmd; +@@ -971,3 +985,4 @@ static void __devinit quirk_usb_early_ha } DECLARE_PCI_FIXUP_CLASS_FINAL(PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_SERIAL_USB, 8, quirk_usb_early_handoff); diff --git a/target/linux/generic/patches-3.7/811-pci_disable_usb_common_quirks.patch b/target/linux/generic/patches-3.7/811-pci_disable_usb_common_quirks.patch index 384c7f8cc4..4b1983e228 100644 --- a/target/linux/generic/patches-3.7/811-pci_disable_usb_common_quirks.patch +++ b/target/linux/generic/patches-3.7/811-pci_disable_usb_common_quirks.patch @@ -21,7 +21,7 @@ /* * Make sure the controller is completely inactive, unable to * generate interrupts or do DMA. -@@ -432,6 +438,13 @@ reset_needed: +@@ -432,8 +438,17 @@ reset_needed: uhci_reset_hc(pdev, base); return 1; } @@ -34,16 +34,11 @@ +#endif EXPORT_SYMBOL_GPL(uhci_check_and_reset_hc); - static inline int io_type_enabled(struct pci_dev *pdev, unsigned int mask) -@@ -461,6 +474,8 @@ static void __devinit quirk_usb_handoff_ - uhci_check_and_reset_hc(pdev, base); - } - +#ifndef CONFIG_PCI_DISABLE_COMMON_QUIRKS + - static int __devinit mmio_resource_enabled(struct pci_dev *pdev, int idx) + static inline int io_type_enabled(struct pci_dev *pdev, unsigned int mask) { - return pci_resource_start(pdev, idx) && mmio_enabled(pdev); + u16 cmd; @@ -971,3 +986,4 @@ static void __devinit quirk_usb_early_ha } DECLARE_PCI_FIXUP_CLASS_FINAL(PCI_ANY_ID, PCI_ANY_ID, |