projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge 3.4-rc6 into usb-next
[deliverable/linux.git]
/
drivers
/
usb
/
host
/
ehci-pci.c
diff --git
a/drivers/usb/host/ehci-pci.c
b/drivers/usb/host/ehci-pci.c
index fe8dc069164ead9f271b3e487d2704e0e74aeaed..bc94d7bf072d822fb32da0867b6759dec223f69a 100644
(file)
--- a/
drivers/usb/host/ehci-pci.c
+++ b/
drivers/usb/host/ehci-pci.c
@@
-368,7
+368,9
@@
static bool usb_is_intel_switchable_ehci(struct pci_dev *pdev)
{
return pdev->class == PCI_CLASS_SERIAL_USB_EHCI &&
pdev->vendor == PCI_VENDOR_ID_INTEL &&
- pdev->device == 0x1E26;
+ (pdev->device == 0x1E26 ||
+ pdev->device == 0x8C2D ||
+ pdev->device == 0x8C26);
}
static void ehci_enable_xhci_companion(void)
This page took
0.023814 seconds
and
5
git commands to generate.