diff options
| author | James Bottomley <jejb@titanic.(none)> | 2005-12-15 18:35:24 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@titanic.(none)> | 2005-12-15 18:35:24 -0500 |
| commit | 2a1e1379bae53f647c463a677cc2ec71b591c348 (patch) | |
| tree | a152beb5e8679e94430c5b47bf798dd8a2d4fd5d /include/linux/pci_ids.h | |
| parent | 787926b1b2d21d42ca462dc736b77f1a4a30c503 (diff) | |
| parent | 7b6666530e2736f190a2629c8abe34275054449f (diff) | |
Merge by hand (conflicts in scsi_lib.c)
This merge is pretty extensive. The conflict is over the new
req->retries parameter, so I had to change the prototype to
scsi_setup_blk_pc_cmnd() and the usage in sd, sr and st.
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'include/linux/pci_ids.h')
| -rw-r--r-- | include/linux/pci_ids.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index aa76fc4e38c2..a17e171384ef 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h | |||
| @@ -1245,6 +1245,7 @@ | |||
| 1245 | #define PCI_DEVICE_ID_VIA_8378_0 0x3205 | 1245 | #define PCI_DEVICE_ID_VIA_8378_0 0x3205 |
| 1246 | #define PCI_DEVICE_ID_VIA_8783_0 0x3208 | 1246 | #define PCI_DEVICE_ID_VIA_8783_0 0x3208 |
| 1247 | #define PCI_DEVICE_ID_VIA_8237 0x3227 | 1247 | #define PCI_DEVICE_ID_VIA_8237 0x3227 |
| 1248 | #define PCI_DEVICE_ID_VIA_8251 0x3287 | ||
| 1248 | #define PCI_DEVICE_ID_VIA_3296_0 0x0296 | 1249 | #define PCI_DEVICE_ID_VIA_3296_0 0x0296 |
| 1249 | #define PCI_DEVICE_ID_VIA_8231 0x8231 | 1250 | #define PCI_DEVICE_ID_VIA_8231 0x8231 |
| 1250 | #define PCI_DEVICE_ID_VIA_8231_4 0x8235 | 1251 | #define PCI_DEVICE_ID_VIA_8231_4 0x8235 |