diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-05-31 00:57:05 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-05-31 00:57:05 -0400 |
| commit | 5bc65793cbf8da0d35f19ef025dda22887e79e80 (patch) | |
| tree | 8291998abd73055de6f487fafa174ee2a5d3afee /drivers/serial/icom.c | |
| parent | 6edae708bf77e012d855a7e2c7766f211d234f4f (diff) | |
| parent | 3f0a6766e0cc5a577805732e5adb50a585c58175 (diff) | |
[SCSI] Merge up to linux-2.6 head
Conflicts:
drivers/scsi/jazz_esp.c
Same changes made by both SCSI and SPARC trees: problem with UTF-8
conversion in the copyright.
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/serial/icom.c')
| -rw-r--r-- | drivers/serial/icom.c | 55 |
1 files changed, 31 insertions, 24 deletions
diff --git a/drivers/serial/icom.c b/drivers/serial/icom.c index 6202995e8211..9d3105b64a7a 100644 --- a/drivers/serial/icom.c +++ b/drivers/serial/icom.c | |||
| @@ -69,33 +69,40 @@ | |||
| 69 | 69 | ||
| 70 | static const struct pci_device_id icom_pci_table[] = { | 70 | static const struct pci_device_id icom_pci_table[] = { |
| 71 | { | 71 | { |
| 72 | .vendor = PCI_VENDOR_ID_IBM, | 72 | .vendor = PCI_VENDOR_ID_IBM, |
| 73 | .device = PCI_DEVICE_ID_IBM_ICOM_DEV_ID_1, | 73 | .device = PCI_DEVICE_ID_IBM_ICOM_DEV_ID_1, |
| 74 | .subvendor = PCI_ANY_ID, | 74 | .subvendor = PCI_ANY_ID, |
| 75 | .subdevice = PCI_ANY_ID, | 75 | .subdevice = PCI_ANY_ID, |
| 76 | .driver_data = ADAPTER_V1, | 76 | .driver_data = ADAPTER_V1, |
| 77 | }, | 77 | }, |
| 78 | { | 78 | { |
| 79 | .vendor = PCI_VENDOR_ID_IBM, | 79 | .vendor = PCI_VENDOR_ID_IBM, |
| 80 | .device = PCI_DEVICE_ID_IBM_ICOM_DEV_ID_2, | 80 | .device = PCI_DEVICE_ID_IBM_ICOM_DEV_ID_2, |
| 81 | .subvendor = PCI_VENDOR_ID_IBM, | 81 | .subvendor = PCI_VENDOR_ID_IBM, |
| 82 | .subdevice = PCI_DEVICE_ID_IBM_ICOM_V2_TWO_PORTS_RVX, | 82 | .subdevice = PCI_DEVICE_ID_IBM_ICOM_V2_TWO_PORTS_RVX, |
| 83 | .driver_data = ADAPTER_V2, | 83 | .driver_data = ADAPTER_V2, |
| 84 | }, | 84 | }, |
| 85 | { | 85 | { |
| 86 | .vendor = PCI_VENDOR_ID_IBM, | 86 | .vendor = PCI_VENDOR_ID_IBM, |
| 87 | .device = PCI_DEVICE_ID_IBM_ICOM_DEV_ID_2, | 87 | .device = PCI_DEVICE_ID_IBM_ICOM_DEV_ID_2, |
| 88 | .subvendor = PCI_VENDOR_ID_IBM, | 88 | .subvendor = PCI_VENDOR_ID_IBM, |
| 89 | .subdevice = PCI_DEVICE_ID_IBM_ICOM_V2_ONE_PORT_RVX_ONE_PORT_MDM, | 89 | .subdevice = PCI_DEVICE_ID_IBM_ICOM_V2_ONE_PORT_RVX_ONE_PORT_MDM, |
| 90 | .driver_data = ADAPTER_V2, | 90 | .driver_data = ADAPTER_V2, |
| 91 | }, | 91 | }, |
| 92 | { | 92 | { |
| 93 | .vendor = PCI_VENDOR_ID_IBM, | 93 | .vendor = PCI_VENDOR_ID_IBM, |
| 94 | .device = PCI_DEVICE_ID_IBM_ICOM_DEV_ID_2, | 94 | .device = PCI_DEVICE_ID_IBM_ICOM_DEV_ID_2, |
| 95 | .subvendor = PCI_VENDOR_ID_IBM, | 95 | .subvendor = PCI_VENDOR_ID_IBM, |
| 96 | .subdevice = PCI_DEVICE_ID_IBM_ICOM_FOUR_PORT_MODEL, | 96 | .subdevice = PCI_DEVICE_ID_IBM_ICOM_FOUR_PORT_MODEL, |
| 97 | .driver_data = ADAPTER_V2, | 97 | .driver_data = ADAPTER_V2, |
| 98 | }, | 98 | }, |
| 99 | { | ||
| 100 | .vendor = PCI_VENDOR_ID_IBM, | ||
| 101 | .device = PCI_DEVICE_ID_IBM_ICOM_DEV_ID_2, | ||
| 102 | .subvendor = PCI_VENDOR_ID_IBM, | ||
| 103 | .subdevice = PCI_DEVICE_ID_IBM_ICOM_V2_ONE_PORT_RVX_ONE_PORT_MDM_PCIE, | ||
| 104 | .driver_data = ADAPTER_V2, | ||
| 105 | }, | ||
| 99 | {} | 106 | {} |
| 100 | }; | 107 | }; |
| 101 | 108 | ||