From a0a5c1274ccb643c13bdc77809a1fb8069d66a98 Mon Sep 17 00:00:00 2001 From: Sebastian Andrzej Siewior Date: Sun, 30 Nov 2008 16:50:04 +0100 Subject: [PATCH] --- yaml --- r: 127263 b: refs/heads/master c: 6c0735687d37e25a65866823881bcbf39a6a023f h: refs/heads/master i: 127261: 2bf7a881b0482551cf23345ab5dca449d1882c71 127259: 01b4556c64578a37fcaffa64f9fa321bcf3d234f 127255: 5dfa30c401b0f856016afa8dba2136166d3351f3 127247: b68c2426f1ef78982149aa31a496506e50e306a1 127231: 9a423d9ad1192d6b82a03819bf4695834d51f463 v: v3 --- [refs] | 2 +- trunk/drivers/usb/host/isp1760-if.c | 16 ++++++++++------ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 19637d4f0522..b38d03450755 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 889394b1eb95f040525d06dd4f2f1222b94023e2 +refs/heads/master: 6c0735687d37e25a65866823881bcbf39a6a023f diff --git a/trunk/drivers/usb/host/isp1760-if.c b/trunk/drivers/usb/host/isp1760-if.c index b87ca7cf4b37..a53114c367cd 100644 --- a/trunk/drivers/usb/host/isp1760-if.c +++ b/trunk/drivers/usb/host/isp1760-if.c @@ -268,12 +268,16 @@ static void isp1761_pci_shutdown(struct pci_dev *dev) printk(KERN_ERR "ips1761_pci_shutdown\n"); } -static const struct pci_device_id isp1760_plx [] = { { - /* handle any USB 2.0 EHCI controller */ - PCI_DEVICE_CLASS(((PCI_CLASS_BRIDGE_OTHER << 8) | (0x06 << 16)), ~0), - .driver_data = 0, -}, -{ /* end: all zeroes */ } +static const struct pci_device_id isp1760_plx [] = { + { + .class = PCI_CLASS_BRIDGE_OTHER << 8, + .class_mask = ~0, + .vendor = PCI_VENDOR_ID_PLX, + .device = 0x5406, + .subvendor = PCI_VENDOR_ID_PLX, + .subdevice = 0x9054, + }, + { } }; MODULE_DEVICE_TABLE(pci, isp1760_plx);