diff options
| author | James Bottomley <jejb@titanic.(none)> | 2005-11-10 09:29:07 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@titanic.(none)> | 2005-11-10 09:29:07 -0500 |
| commit | 8a87a0b6313109d2fea87b1271d497c954ce2ca8 (patch) | |
| tree | 1b7ae51ff681e27118590e9cab4bf0ce38f5d80e /drivers/scsi/pci2000.h | |
| parent | e6a04466ba965875a6132700fabb2f2c0249c41a (diff) | |
| parent | 3b44f137b9a846c5452d9e6e1271b79b1dbcc942 (diff) | |
Merge by hand (whitespace conflicts in libata.h)
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi/pci2000.h')
| -rw-r--r-- | drivers/scsi/pci2000.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/scsi/pci2000.h b/drivers/scsi/pci2000.h index f945a4232e5..0ebd8ce9e1d 100644 --- a/drivers/scsi/pci2000.h +++ b/drivers/scsi/pci2000.h | |||
| @@ -26,9 +26,6 @@ | |||
| 26 | #ifndef PSI_EIDE_SCSIOP | 26 | #ifndef PSI_EIDE_SCSIOP |
| 27 | #define PSI_EIDE_SCSIOP 1 | 27 | #define PSI_EIDE_SCSIOP 1 |
| 28 | 28 | ||
| 29 | #ifndef LINUX_VERSION_CODE | ||
| 30 | #include <linux/version.h> | ||
| 31 | #endif | ||
| 32 | #define LINUXVERSION(v,p,s) (((v)<<16) + ((p)<<8) + (s)) | 29 | #define LINUXVERSION(v,p,s) (((v)<<16) + ((p)<<8) + (s)) |
| 33 | 30 | ||
| 34 | /************************************************/ | 31 | /************************************************/ |