---

yaml --- r: 276345 b: refs/heads/master c: 0de1350 h: refs/heads/master i: 276343: 65295ed v: v3
git-mirror · Dec 1, 2011 · 82ab31c · 82ab31c
1 parent 47bbb35
commit 82ab31c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 158886cd2cf4599e04f9b7e10cb767f5f39b14f1
+refs/heads/master: 0de13500ad1d8a66b7dc1e7fa517ea15a2625c9e
diff --git a/trunk/drivers/usb/host/xhci-pci.c b/trunk/drivers/usb/host/xhci-pci.c
@@ -33,8 +33,6 @@
 #define PCI_VENDOR_ID_ETRON		0x1b6f
 #define PCI_DEVICE_ID_ASROCK_P67	0x7023
 
-#define PCI_DEVICE_ID_NEC_uPD720200	0x0194
-
 static const char hcd_name[] = "xhci_hcd";
 
 /* called after powerup, by probe or system-pm "wakeup" */
@@ -76,11 +74,8 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci)
 				pdev->revision);
 	}
 
-	if (pdev->vendor == PCI_VENDOR_ID_NEC) {
+	if (pdev->vendor == PCI_VENDOR_ID_NEC)
 		xhci->quirks |= XHCI_NEC_HOST;
-		if (pdev->device == PCI_DEVICE_ID_NEC_uPD720200)
-			xhci->quirks |= XHCI_RESET_ON_RESUME;
-	}
 
 	if (pdev->vendor == PCI_VENDOR_ID_AMD && xhci->hci_version == 0x96)
 		xhci->quirks |= XHCI_AMD_0x96_HOST;