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 | 5a96c5fd94c7ef3516c0e4da3a5b3c0713f468b2 (patch) | |
tree | 8c54c9de04bc6b39f1186a9ad6c0550852fb09a0 /target/linux/generic/patches-3.6 | |
parent | f172fc4f39bf3636330193d0bbad0fcf21ad3295 (diff) | |
download | upstream-5a96c5fd94c7ef3516c0e4da3a5b3c0713f468b2.tar.gz upstream-5a96c5fd94c7ef3516c0e4da3a5b3c0713f468b2.tar.bz2 upstream-5a96c5fd94c7ef3516c0e4da3a5b3c0713f468b2.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>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34675 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.6')
-rw-r--r-- | target/linux/generic/patches-3.6/811-pci_disable_usb_common_quirks.patch | 14 |
1 files changed, 4 insertions, 10 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); |