diff options
| author | James Bottomley <jejb@titanic.(none)> | 2005-06-17 18:42:23 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@titanic.(none)> | 2005-06-17 18:42:23 -0500 |
| commit | 3237ee78fc00f786d5f5aec6f9310b0e39069f15 (patch) | |
| tree | 4c94e70ab846ffcb8bb5715fb3c8d8473358a323 /drivers/scsi/mac_scsi.c | |
| parent | 9ee1c939d1cb936b1f98e8d81aeffab57bae46ab (diff) | |
| parent | df0ae2497ddefd72a87f3a3b34ff32455d7d4ae0 (diff) | |
| download | kernel_samsung_smdk4412-3237ee78fc00f786d5f5aec6f9310b0e39069f15.tar.gz kernel_samsung_smdk4412-3237ee78fc00f786d5f5aec6f9310b0e39069f15.tar.bz2 kernel_samsung_smdk4412-3237ee78fc00f786d5f5aec6f9310b0e39069f15.zip | |
merge by hand (fix up qla_os.c merge error)
Diffstat (limited to 'drivers/scsi/mac_scsi.c')
| -rw-r--r-- | drivers/scsi/mac_scsi.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/scsi/mac_scsi.c b/drivers/scsi/mac_scsi.c index d5fd17ef74d..92d2c8379ab 100644 --- a/drivers/scsi/mac_scsi.c +++ b/drivers/scsi/mac_scsi.c @@ -591,8 +591,6 @@ static Scsi_Host_Template driver_template = { .queuecommand = macscsi_queue_command, .eh_abort_handler = macscsi_abort, .eh_bus_reset_handler = macscsi_bus_reset, - .eh_device_reset_handler = macscsi_device_reset, - .eh_host_reset_handler = macscsi_host_reset, .can_queue = CAN_QUEUE, .this_id = 7, .sg_tablesize = SG_ALL, |