diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-06-14 02:22:54 +0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-06-14 02:22:54 +0400 |
| commit | e17f8af316525c2a795bb314dfcc23201fb51ef4 (patch) | |
| tree | 99ea9c56dc9e8fc6485d0513e71aacdb50a19792 /drivers/usb/host | |
| parent | a276400d14bb5b98a5db1d87bbee7b1621abe4a1 (diff) | |
| parent | 0b84704a2d6fdf55a3dcdd2a1f2ac8b48913c84b (diff) | |
| download | linux-e17f8af316525c2a795bb314dfcc23201fb51ef4.tar.xz | |
Merge branch 'usb-linus' into usb-next
This is to pick up the changes to the option driver, which are needed
for follow-on patches from Johan.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/host')
| -rw-r--r-- | drivers/usb/host/ehci-pci.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/usb/host/ehci-pci.c b/drivers/usb/host/ehci-pci.c index bc94d7bf072d..123481793a47 100644 --- a/drivers/usb/host/ehci-pci.c +++ b/drivers/usb/host/ehci-pci.c @@ -144,14 +144,6 @@ static int ehci_pci_setup(struct usb_hcd *hcd) hcd->has_tt = 1; tdi_reset(ehci); } - if (pdev->subsystem_vendor == PCI_VENDOR_ID_ASUSTEK) { - /* EHCI #1 or #2 on 6 Series/C200 Series chipset */ - if (pdev->device == 0x1c26 || pdev->device == 0x1c2d) { - ehci_info(ehci, "broken D3 during system sleep on ASUS\n"); - hcd->broken_pci_sleep = 1; - device_set_wakeup_capable(&pdev->dev, false); - } - } break; case PCI_VENDOR_ID_TDI: if (pdev->device == PCI_DEVICE_ID_TDI_EHCI) { |