diff options
| author | Varun Wadekar <vwadekar@nvidia.com> | 2012-06-11 11:29:44 +0530 |
|---|---|---|
| committer | Varun Wadekar <vwadekar@nvidia.com> | 2012-06-11 11:29:44 +0530 |
| commit | e6dca42c2c2ad0f06c6704c73a03e5516dc14b13 (patch) | |
| tree | 6ce2385fd736a6fc9a02ace4f5f139a6c8cfbaaf /drivers/usb/host/ehci-pci.c | |
| parent | 462ba8b0bca7e376722158f1f1a094ba1c0bd1ad (diff) | |
| parent | 1f5547c7f183363eabe07e5d202a49f2e94e995a (diff) | |
Merge commit 'v3.4.2' into android-tegra-nv-3.4
Conflicts:
drivers/i2c/busses/i2c-tegra.c
drivers/usb/gadget/fsl_udc_core.c
Change-Id: Ibfc3a8edc3665b832ddc94f89fc17b556629d104
Signed-off-by: Varun Wadekar <vwadekar@nvidia.com>
Diffstat (limited to 'drivers/usb/host/ehci-pci.c')
| -rw-r--r-- | drivers/usb/host/ehci-pci.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/usb/host/ehci-pci.c b/drivers/usb/host/ehci-pci.c index fe8dc069164e..bc94d7bf072d 100644 --- 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) |