diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-22 14:36:49 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-22 14:36:49 -0400 |
| commit | e6f194d8f6f50da6837af637b2fd839c34185f7a (patch) | |
| tree | f3c479a2bc24d49a150ff183e2614ee0f76cb366 /drivers/firewire | |
| parent | 7578634990fb47cc30083fbd812689aa6deacfc0 (diff) | |
| parent | b91421749a1840148d8c81637c03c0ace3f35269 (diff) | |
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: (60 commits)
[SCSI] libsas: make ATA functions selectable by a config option
[SCSI] bsg: unexport sg v3 helper functions
[SCSI] bsg: fix bsg_unregister_queue
[SCSI] bsg: make class backlinks
[SCSI] 3w-9xxx: add support for 9690SA
[SCSI] bsg: fix bsg_register_queue error path
[SCSI] ESP: Increase ESP_BUS_TIMEOUT to 275.
[SCSI] libsas: fix scr_read/write users and update the libata documentation
[SCSI] mpt fusion: update Kconfig help
[SCSI] scsi_transport_sas: add destructor for bsg
[SCSI] iscsi_tcp: buggered kmalloc()
[SCSI] qla2xxx: Update version number to 8.02.00-k2.
[SCSI] qla2xxx: Add ISP25XX support.
[SCSI] qla2xxx: Use pci_try_set_mwi().
[SCSI] qla2xxx: Use PCI-X/PCI-Express read control interfaces.
[SCSI] qla2xxx: Re-factor isp_operations to static structures.
[SCSI] qla2xxx: Validate mid-layer 'underflow' during check-condition handling.
[SCSI] qla2xxx: Correct setting of 'current' and 'supported' speeds during FDMI registration.
[SCSI] qla2xxx: Generalize iIDMA support.
[SCSI] qla2xxx: Generalize FW-Interface-2 support.
...
Diffstat (limited to 'drivers/firewire')
| -rw-r--r-- | drivers/firewire/fw-sbp2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/firewire/fw-sbp2.c b/drivers/firewire/fw-sbp2.c index fc984474162c..3e4a369d0057 100644 --- a/drivers/firewire/fw-sbp2.c +++ b/drivers/firewire/fw-sbp2.c | |||
| @@ -1160,7 +1160,7 @@ static struct device_attribute *sbp2_scsi_sysfs_attrs[] = { | |||
| 1160 | static struct scsi_host_template scsi_driver_template = { | 1160 | static struct scsi_host_template scsi_driver_template = { |
| 1161 | .module = THIS_MODULE, | 1161 | .module = THIS_MODULE, |
| 1162 | .name = "SBP-2 IEEE-1394", | 1162 | .name = "SBP-2 IEEE-1394", |
| 1163 | .proc_name = (char *)sbp2_driver_name, | 1163 | .proc_name = sbp2_driver_name, |
| 1164 | .queuecommand = sbp2_scsi_queuecommand, | 1164 | .queuecommand = sbp2_scsi_queuecommand, |
| 1165 | .slave_alloc = sbp2_scsi_slave_alloc, | 1165 | .slave_alloc = sbp2_scsi_slave_alloc, |
| 1166 | .slave_configure = sbp2_scsi_slave_configure, | 1166 | .slave_configure = sbp2_scsi_slave_configure, |