2 --- a/drivers/usb/host/pci-quirks.c
3 +++ b/drivers/usb/host/pci-quirks.c
4 @@ -434,6 +434,8 @@ reset_needed:
6 EXPORT_SYMBOL_GPL(uhci_check_and_reset_hc);
8 +#ifndef CONFIG_PCI_DISABLE_COMMON_QUIRKS
10 static inline int io_type_enabled(struct pci_dev *pdev, unsigned int mask)
13 @@ -971,3 +973,4 @@ static void __devinit quirk_usb_early_ha
15 DECLARE_PCI_FIXUP_CLASS_FINAL(PCI_ANY_ID, PCI_ANY_ID,
16 PCI_CLASS_SERIAL_USB, 8, quirk_usb_early_handoff);