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/t128.h | |
parent | 63ff05910d9652f8a0c4dbb6c7772cfca5364f12 (diff) | |
parent | e90b25fa40a43f63fc9a035c11ba9ca3e4e60949 (diff) | |
download | blackbird-op-linux-b4c43993f448d0e25fe40690d9e9c81a8ebda623.tar.gz blackbird-op-linux-b4c43993f448d0e25fe40690d9e9c81a8ebda623.zip |
Merge remote-tracking branch 'scsi-queue/drivers-for-3.16' into for-linus
Diffstat (limited to 'drivers/scsi/t128.h')
-rw-r--r-- | drivers/scsi/t128.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/scsi/t128.h b/drivers/scsi/t128.h index 1df82c28e56d..fd68cecc62af 100644 --- a/drivers/scsi/t128.h +++ b/drivers/scsi/t128.h @@ -34,10 +34,6 @@ * 1+ (800) 334-5454 */ -/* - * $Log: t128.h,v $ - */ - #ifndef T128_H #define T128_H @@ -107,8 +103,6 @@ static int t128_bus_reset(struct scsi_cmnd *); #define CAN_QUEUE 32 #endif -#ifndef HOSTS_C - #define NCR5380_implementation_fields \ void __iomem *base @@ -148,6 +142,5 @@ static int t128_bus_reset(struct scsi_cmnd *); #define T128_IRQS 0xc4a8 -#endif /* else def HOSTS_C */ #endif /* ndef ASM */ #endif /* T128_H */ |