diff options
author | James Bottomley <JBottomley@Parallels.com> | 2014-06-09 07:49:39 -0700 |
---|---|---|
committer | James Bottomley <JBottomley@Parallels.com> | 2014-06-09 07:49:39 -0700 |
commit | b4c43993f448d0e25fe40690d9e9c81a8ebda623 (patch) | |
tree | 7cc19990b0b00226ce3063d956790368bfe62ada /drivers/scsi/mac_scsi.h | |
parent | 63ff05910d9652f8a0c4dbb6c7772cfca5364f12 (diff) | |
parent | e90b25fa40a43f63fc9a035c11ba9ca3e4e60949 (diff) | |
download | blackbird-obmc-linux-b4c43993f448d0e25fe40690d9e9c81a8ebda623.tar.gz blackbird-obmc-linux-b4c43993f448d0e25fe40690d9e9c81a8ebda623.zip |
Merge remote-tracking branch 'scsi-queue/drivers-for-3.16' into for-linus
Diffstat (limited to 'drivers/scsi/mac_scsi.h')
-rw-r--r-- | drivers/scsi/mac_scsi.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/drivers/scsi/mac_scsi.h b/drivers/scsi/mac_scsi.h index 7dc62fce1c4c..06969b06e54b 100644 --- a/drivers/scsi/mac_scsi.h +++ b/drivers/scsi/mac_scsi.h @@ -22,10 +22,6 @@ * 1+ (800) 334-5454 */ -/* - * $Log: cumana_NCR5380.h,v $ - */ - #ifndef MAC_NCR5380_H #define MAC_NCR5380_H @@ -51,8 +47,6 @@ #include <scsi/scsicam.h> -#ifndef HOSTS_C - #define NCR5380_implementation_fields \ int port, ctrl @@ -75,10 +69,6 @@ #define NCR5380_show_info macscsi_show_info #define NCR5380_write_info macscsi_write_info -#define BOARD_NORMAL 0 -#define BOARD_NCR53C400 1 - -#endif /* ndef HOSTS_C */ #endif /* ndef ASM */ #endif /* MAC_NCR5380_H */ |