openwrtv4/target/linux/generic/patches-3.3/811-pci_disable_usb_common_quirks.patch
Gabor Juhos 419d9e2f54 linux/3.3: refresh patches against 3.3-rc5
SVN-Revision: 30799
2012-03-03 14:10:24 +00:00

18 lines
468 B
Diff

--- a/drivers/usb/host/pci-quirks.c
+++ b/drivers/usb/host/pci-quirks.c
@@ -431,6 +431,8 @@ reset_needed:
}
EXPORT_SYMBOL_GPL(uhci_check_and_reset_hc);
+#ifndef CONFIG_PCI_DISABLE_COMMON_QUIRKS
+
static inline int io_type_enabled(struct pci_dev *pdev, unsigned int mask)
{
u16 cmd;
@@ -894,3 +896,5 @@ static void __devinit quirk_usb_early_ha
pci_disable_device(pdev);
}
DECLARE_PCI_FIXUP_FINAL(PCI_ANY_ID, PCI_ANY_ID, quirk_usb_early_handoff);
+
+#endif