Changeset 25785


Ignore:
Timestamp:
2011-02-28T02:20:49+01:00 (7 years ago)
Author:
nbd
Message:

kernel: the usb pci quirks removal patch was a bit overzealous, leave in some functions referenced from other modules

Location:
trunk/target/linux/generic
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/generic/patches-2.6.37/031-pci_disable_usb_common_quirks.patch

    r25768 r25785  
    1 --- a/drivers/usb/host/Makefile 
    2 +++ b/drivers/usb/host/Makefile 
    3 @@ -16,7 +16,9 @@ xhci-hcd-y += xhci-ring.o xhci-hub.o xhc 
     1 
     2--- a/drivers/usb/host/pci-quirks.c 
     3+++ b/drivers/usb/host/pci-quirks.c 
     4@@ -134,6 +134,8 @@ reset_needed: 
     5 } 
     6 EXPORT_SYMBOL_GPL(uhci_check_and_reset_hc); 
    47  
    5  obj-$(CONFIG_USB_WHCI_HCD)     += whci/ 
    6   
    7 +ifndef CONFIG_PCI_DISABLE_COMMON_QUIRKS 
    8  obj-$(CONFIG_PCI)              += pci-quirks.o 
    9 +endif 
    10   
    11  obj-$(CONFIG_USB_EHCI_HCD)     += ehci-hcd.o 
    12  obj-$(CONFIG_USB_OXU210HP_HCD) += oxu210hp-hcd.o 
     8+#ifndef CONFIG_PCI_DISABLE_COMMON_QUIRKS 
     9+ 
     10 static inline int io_type_enabled(struct pci_dev *pdev, unsigned int mask) 
     11 { 
     12        u16 cmd; 
     13@@ -478,3 +480,5 @@ static void __devinit quirk_usb_early_ha 
     14                quirk_usb_handoff_xhci(pdev); 
     15 } 
     16 DECLARE_PCI_FIXUP_FINAL(PCI_ANY_ID, PCI_ANY_ID, quirk_usb_early_handoff); 
     17+ 
     18+#endif 
  • trunk/target/linux/generic/patches-2.6.38/031-pci_disable_usb_common_quirks.patch

    r25768 r25785  
    1 --- a/drivers/usb/host/Makefile 
    2 +++ b/drivers/usb/host/Makefile 
    3 @@ -16,7 +16,9 @@ xhci-hcd-y += xhci-ring.o xhci-hub.o xhc 
     1 
     2--- a/drivers/usb/host/pci-quirks.c 
     3+++ b/drivers/usb/host/pci-quirks.c 
     4@@ -134,6 +134,8 @@ reset_needed: 
     5 } 
     6 EXPORT_SYMBOL_GPL(uhci_check_and_reset_hc); 
    47  
    5  obj-$(CONFIG_USB_WHCI_HCD)     += whci/ 
    6   
    7 +ifndef CONFIG_PCI_DISABLE_COMMON_QUIRKS 
    8  obj-$(CONFIG_PCI)              += pci-quirks.o 
    9 +endif 
    10   
    11  obj-$(CONFIG_USB_EHCI_HCD)     += ehci-hcd.o 
    12  obj-$(CONFIG_USB_OXU210HP_HCD) += oxu210hp-hcd.o 
     8+#ifndef CONFIG_PCI_DISABLE_COMMON_QUIRKS 
     9+ 
     10 static inline int io_type_enabled(struct pci_dev *pdev, unsigned int mask) 
     11 { 
     12        u16 cmd; 
     13@@ -478,3 +480,5 @@ static void __devinit quirk_usb_early_ha 
     14                quirk_usb_handoff_xhci(pdev); 
     15 } 
     16 DECLARE_PCI_FIXUP_FINAL(PCI_ANY_ID, PCI_ANY_ID, quirk_usb_early_handoff); 
     17+ 
     18+#endif 
Note: See TracChangeset for help on using the changeset viewer.