kernel/generic: fix build failure on missing uhci symbol
authorFlorian Fainelli <florian@openwrt.org>
Mon, 10 Dec 2012 14:24:28 +0000 (14:24 +0000)
committerFlorian Fainelli <florian@openwrt.org>
Mon, 10 Dec 2012 14:24:28 +0000 (14:24 +0000)
linux-3.6.8/drivers/usb/host/pci-quirks.c:471: undefined reference to
`uhci_check_and_reset_hc'

Signed-off-by: Florian Fainelli <florian@openwrt.org>
SVN-Revision: 34599

target/linux/generic/patches-3.6/811-pci_disable_usb_common_quirks.patch

index 56d4743..384c7f8 100644 (file)
  /*
   * Make sure the controller is completely inactive, unable to
   * generate interrupts or do DMA.
-@@ -434,6 +440,10 @@ reset_needed:
+@@ -432,6 +438,13 @@ reset_needed:
+       uhci_reset_hc(pdev, base);
+       return 1;
  }
++#else
++int uhci_check_and_reset_hc(struct pci_dev *pdev, unsigned long base)
++{
++      return 0;
++}
++
++#endif
  EXPORT_SYMBOL_GPL(uhci_check_and_reset_hc);
  
-+#endif
-+
+ 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 inline int io_type_enabled(struct pci_dev *pdev, unsigned int mask)
+ static int __devinit mmio_resource_enabled(struct pci_dev *pdev, int idx)
  {
-       u16 cmd;
-@@ -971,3 +981,4 @@ static void __devinit quirk_usb_early_ha
+       return pci_resource_start(pdev, idx) && mmio_enabled(pdev);
+@@ -971,3 +986,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);