diff options
| author | James Bottomley <jejb@titanic.(none)> | 2005-06-17 19:42:23 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@titanic.(none)> | 2005-06-17 19:42:23 -0400 |
| commit | 3237ee78fc00f786d5f5aec6f9310b0e39069f15 (patch) | |
| tree | 4c94e70ab846ffcb8bb5715fb3c8d8473358a323 /drivers/scsi/mac_scsi.h | |
| parent | 9ee1c939d1cb936b1f98e8d81aeffab57bae46ab (diff) | |
| parent | df0ae2497ddefd72a87f3a3b34ff32455d7d4ae0 (diff) | |
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 @@ | |||
| 72 | #define NCR5380_queue_command macscsi_queue_command | 72 | #define NCR5380_queue_command macscsi_queue_command |
| 73 | #define NCR5380_abort macscsi_abort | 73 | #define NCR5380_abort macscsi_abort |
| 74 | #define NCR5380_bus_reset macscsi_bus_reset | 74 | #define NCR5380_bus_reset macscsi_bus_reset |
| 75 | #define NCR5380_device_reset macscsi_device_reset | ||
| 76 | #define NCR5380_host_reset macscsi_host_reset | ||
| 77 | #define NCR5380_proc_info macscsi_proc_info | 75 | #define NCR5380_proc_info macscsi_proc_info |
| 78 | 76 | ||
| 79 | #define BOARD_NORMAL 0 | 77 | #define BOARD_NORMAL 0 |