kernel: update linux 3.6 to 3.6.11

[oweals/openwrt.git] / target / linux / generic / patches-3.6 / 811-pci_disable_usb_common_quirks.patch

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 56d4743df1e3fa217273361d4ce930452562dd2c..271e53db50a137bae85b43a6981b46a66f6ef538 100644 (file)
--- 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,18 +21,24 @@
  /*
   * Make sure the controller is completely inactive, unable to
   * generate interrupts or do DMA.
-@@ -434,6 +440,10 @@ reset_needed:
+@@ -432,8 +438,16 @@ 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
-+
 +#ifndef CONFIG_PCI_DISABLE_COMMON_QUIRKS
-+
  static inline int io_type_enabled(struct pci_dev *pdev, unsigned int mask)
  {
        u16 cmd;
-@@ -971,3 +981,4 @@ static void __devinit quirk_usb_early_ha
+@@ -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);