diff options
| author | James Bottomley <jejb@sparkweed.localdomain> | 2006-09-23 16:33:43 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@sparkweed.localdomain> | 2006-09-23 16:33:43 -0400 |
| commit | c9802cd9574a80444e689c7525627b40d7dc3a06 (patch) | |
| tree | 5954e2ac7e97023b51d36127963a1e9262fbcfe0 /drivers/scsi/aic7xxx_old.c | |
| parent | 3eeab61aa3ddd3c0bedb7449ada1599de22fdb5a (diff) | |
| parent | 2d2f8d59b14bec6c745e219a350ac51d9e00673f (diff) | |
Merge mulgrave-w:git/scsi-misc-2.6
Conflicts:
drivers/scsi/iscsi_tcp.c
drivers/scsi/iscsi_tcp.h
Pretty horrible merge between crypto hash consolidation
and crypto_digest_...->crypto_hash_... conversion
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi/aic7xxx_old.c')
| -rw-r--r-- | drivers/scsi/aic7xxx_old.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/scsi/aic7xxx_old.c b/drivers/scsi/aic7xxx_old.c index 3f85b5e978f1..ba3bccafe113 100644 --- a/drivers/scsi/aic7xxx_old.c +++ b/drivers/scsi/aic7xxx_old.c | |||
| @@ -249,8 +249,6 @@ | |||
| 249 | #include <linux/stat.h> | 249 | #include <linux/stat.h> |
| 250 | #include <linux/slab.h> /* for kmalloc() */ | 250 | #include <linux/slab.h> /* for kmalloc() */ |
| 251 | 251 | ||
| 252 | #include <linux/config.h> /* for CONFIG_PCI */ | ||
| 253 | |||
| 254 | #define AIC7XXX_C_VERSION "5.2.6" | 252 | #define AIC7XXX_C_VERSION "5.2.6" |
| 255 | 253 | ||
| 256 | #define ALL_TARGETS -1 | 254 | #define ALL_TARGETS -1 |