diff options
| author | James Bottomley <jejb@titanic.(none)> | 2005-06-18 01:42:23 +0200 |
|---|---|---|
| committer | James Bottomley <jejb@titanic.(none)> | 2005-06-18 01:42:23 +0200 |
| commit | 3237ee78fc00f786d5f5aec6f9310b0e39069f15 (patch) | |
| tree | 4c94e70ab846ffcb8bb5715fb3c8d8473358a323 /drivers/scsi/mac_scsi.h | |
| parent | Linux 2.6.12 (diff) | |
| parent | [SCSI] allow sleeping in ->eh_host_reset_handler() (diff) | |
| download | linux-3237ee78fc00f786d5f5aec6f9310b0e39069f15.tar.xz linux-3237ee78fc00f786d5f5aec6f9310b0e39069f15.zip | |
merge by hand (fix up qla_os.c merge error)
Diffstat (limited to 'drivers/scsi/mac_scsi.h')
| -rw-r--r-- | drivers/scsi/mac_scsi.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/scsi/mac_scsi.h b/drivers/scsi/mac_scsi.h index 23ab2c18a016..d26e331c6c12 100644 --- a/drivers/scsi/mac_scsi.h +++ b/drivers/scsi/mac_scsi.h @@ -72,8 +72,6 @@ #define NCR5380_queue_command macscsi_queue_command #define NCR5380_abort macscsi_abort #define NCR5380_bus_reset macscsi_bus_reset -#define NCR5380_device_reset macscsi_device_reset -#define NCR5380_host_reset macscsi_host_reset #define NCR5380_proc_info macscsi_proc_info #define BOARD_NORMAL 0 |