diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
| commit | 1c01a80cfec6f806246f31ff2680cd3639b30e67 (patch) | |
| tree | 0b554aad2ec1da71ecf6339d4ba51617bfe1dc3c /drivers/scsi/ips.h | |
| parent | c44d79950b2daa1025e62eede73e4e4a274d1ef3 (diff) | |
| parent | 4a9f65f6304a00f6473e83b19c1e83caa1e42530 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/smsc911x.c
Diffstat (limited to 'drivers/scsi/ips.h')
| -rw-r--r-- | drivers/scsi/ips.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/ips.h b/drivers/scsi/ips.h index 4e49fbcfe8a..f2df0593332 100644 --- a/drivers/scsi/ips.h +++ b/drivers/scsi/ips.h | |||
| @@ -1193,7 +1193,7 @@ typedef struct { | |||
| 1193 | #define IPS_VER_SEBRING "7.12.02" | 1193 | #define IPS_VER_SEBRING "7.12.02" |
| 1194 | #define IPS_VER_KEYWEST "7.12.02" | 1194 | #define IPS_VER_KEYWEST "7.12.02" |
| 1195 | 1195 | ||
| 1196 | /* Compatability IDs for various adapters */ | 1196 | /* Compatibility IDs for various adapters */ |
| 1197 | #define IPS_COMPAT_UNKNOWN "" | 1197 | #define IPS_COMPAT_UNKNOWN "" |
| 1198 | #define IPS_COMPAT_CURRENT "KW710" | 1198 | #define IPS_COMPAT_CURRENT "KW710" |
| 1199 | #define IPS_COMPAT_SERVERAID1 "2.25.01" | 1199 | #define IPS_COMPAT_SERVERAID1 "2.25.01" |