diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-21 14:18:25 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-21 14:18:25 -0400 |
| commit | 28e4b224955cbe30275b2a7842e729023a4f4b03 (patch) | |
| tree | ab4d28fecc06070fc2a2742f4b4550b29de44912 /drivers/scsi/gdth.h | |
| parent | 22ae813b85df7c0b0fc7c8d6f336d6a9f566ff97 (diff) | |
| parent | 67d59dfdeb21df2c16dcd478b66177e91178ecd0 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (85 commits)
[SCSI] 53c700: remove reliance on deprecated cmnd fields
[SCSI] hptiop: don't use cmnd->bufflen
[SCSI] hptiop: HighPoint RocketRAID 3xxx controller driver
[SCSI] aacraid: small misc. cleanups
[SCSI] aacraid: Update supported product information
[SCSI] aacraid: Fix return code interpretation
[SCSI] scsi_transport_sas: fix panic in sas_free_rphy
[SCSI] remove RQ_SCSI_* flags
[SCSI] remove scsi_request infrastructure
[SCSI] mptfusion: change driver revision to 3.03.10
[SCSI] mptfc: abort of board reset leaves port dead requiring reboot
[SCSI] mptfc: fix fibre channel infinite request/response loop
[SCSI] mptfc: set fibre channel fw target missing timers to one second
[SCSI] mptfusion: move fc event/reset handling to mptfc
[SCSI] spi transport: don't allow dt to be set on SE or HVD buses
[SCSI] aic7xxx: expose the bus setting to sysfs
[SCSI] scsi: remove Documentation/scsi/cpqfc.txt
[SCSI] drivers/scsi: Use ARRAY_SIZE macro
[SCSI] Remove last page_address from dc395x.c
[SCSI] hptiop: HighPoint RocketRAID 3xxx controller driver
...
Fixed up conflicts in drivers/message/fusion/mptbase.c manually (due to
the sparc interrupt cleanups)
Diffstat (limited to 'drivers/scsi/gdth.h')
| -rw-r--r-- | drivers/scsi/gdth.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/scsi/gdth.h b/drivers/scsi/gdth.h index cc4882fb97ad..47eae0299750 100644 --- a/drivers/scsi/gdth.h +++ b/drivers/scsi/gdth.h | |||
| @@ -4,13 +4,13 @@ | |||
| 4 | /* | 4 | /* |
| 5 | * Header file for the GDT Disk Array/Storage RAID controllers driver for Linux | 5 | * Header file for the GDT Disk Array/Storage RAID controllers driver for Linux |
| 6 | * | 6 | * |
| 7 | * gdth.h Copyright (C) 1995-03 ICP vortex, Achim Leubner | 7 | * gdth.h Copyright (C) 1995-06 ICP vortex, Achim Leubner |
| 8 | * See gdth.c for further informations and | 8 | * See gdth.c for further informations and |
| 9 | * below for supported controller types | 9 | * below for supported controller types |
| 10 | * | 10 | * |
| 11 | * <achim_leubner@adaptec.com> | 11 | * <achim_leubner@adaptec.com> |
| 12 | * | 12 | * |
| 13 | * $Id: gdth.h,v 1.57 2004/03/31 11:52:09 achim Exp $ | 13 | * $Id: gdth.h,v 1.58 2006/01/11 16:14:09 achim Exp $ |
| 14 | */ | 14 | */ |
| 15 | 15 | ||
| 16 | #include <linux/version.h> | 16 | #include <linux/version.h> |
| @@ -26,9 +26,9 @@ | |||
| 26 | /* defines, macros */ | 26 | /* defines, macros */ |
| 27 | 27 | ||
| 28 | /* driver version */ | 28 | /* driver version */ |
| 29 | #define GDTH_VERSION_STR "3.04" | 29 | #define GDTH_VERSION_STR "3.05" |
| 30 | #define GDTH_VERSION 3 | 30 | #define GDTH_VERSION 3 |
| 31 | #define GDTH_SUBVERSION 4 | 31 | #define GDTH_SUBVERSION 5 |
| 32 | 32 | ||
| 33 | /* protocol version */ | 33 | /* protocol version */ |
| 34 | #define PROTOCOL_VERSION 1 | 34 | #define PROTOCOL_VERSION 1 |