Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (207 commits) [SCSI] gdth: fix CONFIG_ISA build failure [SCSI] esp_scsi: remove __dev{init,exit} [SCSI] gdth: !use_sg cleanup and use of scsi accessors [SCSI] gdth: Move members from SCp to gdth_cmndinfo, stage 2 [SCSI] gdth: Setup proper per-command private data [SCSI] gdth: Remove gdth_ctr_tab[] [SCSI] gdth: switch to modern scsi host registration [SCSI] gdth: gdth_interrupt() gdth_get_status() & gdth_wait() fixes [SCSI] gdth: clean up host private data [SCSI] gdth: Remove virt hosts [SCSI] gdth: Reorder scsi_host_template intitializers [SCSI] gdth: kill gdth_{read,write}[bwl] wrappers [SCSI] gdth: Remove 2.4.x support, in-kernel changelog [SCSI] gdth: split out pci probing [SCSI] gdth: split out eisa probing [SCSI] gdth: split out isa probing gdth: Make one abuse of scsi_cmnd less obvious [SCSI] NCR5380: Use scsi_eh API for REQUEST_SENSE invocation [SCSI] usb storage: use scsi_eh API in REQUEST_SENSE execution [SCSI] scsi_error: Refactoring scsi_error to facilitate in synchronous REQUEST_SENSE ...
This commit is contained in:
@@ -1467,6 +1467,8 @@
|
||||
#define PCI_DEVICE_ID_TOSHIBA_TC86C001_MISC 0x0108
|
||||
#define PCI_DEVICE_ID_TOSHIBA_SPIDER_NET 0x01b3
|
||||
|
||||
#define PCI_VENDOR_ID_ATTO 0x117c
|
||||
|
||||
#define PCI_VENDOR_ID_RICOH 0x1180
|
||||
#define PCI_DEVICE_ID_RICOH_RL5C465 0x0465
|
||||
#define PCI_DEVICE_ID_RICOH_RL5C466 0x0466
|
||||
@@ -2075,6 +2077,9 @@
|
||||
#define PCI_DEVICE_ID_ARECA_1130 0x1130
|
||||
#define PCI_DEVICE_ID_ARECA_1160 0x1160
|
||||
#define PCI_DEVICE_ID_ARECA_1170 0x1170
|
||||
#define PCI_DEVICE_ID_ARECA_1200 0x1200
|
||||
#define PCI_DEVICE_ID_ARECA_1201 0x1201
|
||||
#define PCI_DEVICE_ID_ARECA_1202 0x1202
|
||||
#define PCI_DEVICE_ID_ARECA_1210 0x1210
|
||||
#define PCI_DEVICE_ID_ARECA_1220 0x1220
|
||||
#define PCI_DEVICE_ID_ARECA_1230 0x1230
|
||||
|
Reference in New Issue
Block a user