diff options
author | Dave Kleikamp <shaggy@austin.ibm.com> | 2005-06-20 09:44:00 -0400 |
---|---|---|
committer | Dave Kleikamp <shaggy@austin.ibm.com> | 2005-06-20 09:44:00 -0400 |
commit | d039ba24f135147f60a13bcaa768189a5b773b6e (patch) | |
tree | 444b7596ab8312b5954d15c3135052a7c09c6fbe /drivers/scsi/mac_scsi.h | |
parent | 72e3148a6e987974e3e949c5668e5ca812d7c818 (diff) | |
parent | 8b22c249e7de453961e4d253b19fc2a0bdd65d53 (diff) |
Merge with /home/shaggy/git/linus-clean/
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 |