diff options
-rw-r--r-- | drivers/scsi/dpt_i2o.c | 7 | ||||
-rw-r--r-- | drivers/scsi/dpti.h | 12 |
2 files changed, 3 insertions, 16 deletions
diff --git a/drivers/scsi/dpt_i2o.c b/drivers/scsi/dpt_i2o.c index a699c30b2662..bbe346bd3cb8 100644 --- a/drivers/scsi/dpt_i2o.c +++ b/drivers/scsi/dpt_i2o.c | |||
@@ -34,7 +34,6 @@ | |||
34 | 34 | ||
35 | #define ADDR32 (0) | 35 | #define ADDR32 (0) |
36 | 36 | ||
37 | #include <linux/version.h> | ||
38 | #include <linux/module.h> | 37 | #include <linux/module.h> |
39 | 38 | ||
40 | MODULE_AUTHOR("Deanna Bonds, with _lots_ of help from Mark Salyzyn"); | 39 | MODULE_AUTHOR("Deanna Bonds, with _lots_ of help from Mark Salyzyn"); |
@@ -1811,9 +1810,9 @@ static int adpt_system_info(void __user *buffer) | |||
1811 | memset(&si, 0, sizeof(si)); | 1810 | memset(&si, 0, sizeof(si)); |
1812 | 1811 | ||
1813 | si.osType = OS_LINUX; | 1812 | si.osType = OS_LINUX; |
1814 | si.osMajorVersion = (u8) (LINUX_VERSION_CODE >> 16); | 1813 | si.osMajorVersion = 0; |
1815 | si.osMinorVersion = (u8) (LINUX_VERSION_CODE >> 8 & 0x0ff); | 1814 | si.osMinorVersion = 0; |
1816 | si.osRevision = (u8) (LINUX_VERSION_CODE & 0x0ff); | 1815 | si.osRevision = 0; |
1817 | si.busType = SI_PCI_BUS; | 1816 | si.busType = SI_PCI_BUS; |
1818 | si.processorFamily = DPTI_sig.dsProcessorFamily; | 1817 | si.processorFamily = DPTI_sig.dsProcessorFamily; |
1819 | 1818 | ||
diff --git a/drivers/scsi/dpti.h b/drivers/scsi/dpti.h index 9821783c0164..489194af43d0 100644 --- a/drivers/scsi/dpti.h +++ b/drivers/scsi/dpti.h | |||
@@ -20,15 +20,7 @@ | |||
20 | #ifndef _DPT_H | 20 | #ifndef _DPT_H |
21 | #define _DPT_H | 21 | #define _DPT_H |
22 | 22 | ||
23 | #ifndef LINUX_VERSION_CODE | ||
24 | #include <linux/version.h> | ||
25 | #endif | ||
26 | |||
27 | #if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,00) | ||
28 | #define MAX_TO_IOP_MESSAGES (210) | ||
29 | #else | ||
30 | #define MAX_TO_IOP_MESSAGES (255) | 23 | #define MAX_TO_IOP_MESSAGES (255) |
31 | #endif | ||
32 | #define MAX_FROM_IOP_MESSAGES (255) | 24 | #define MAX_FROM_IOP_MESSAGES (255) |
33 | 25 | ||
34 | 26 | ||
@@ -321,10 +313,6 @@ static int adpt_close(struct inode *inode, struct file *file); | |||
321 | static void adpt_delay(int millisec); | 313 | static void adpt_delay(int millisec); |
322 | #endif | 314 | #endif |
323 | 315 | ||
324 | #if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,0) | ||
325 | static struct pci_dev* adpt_pci_find_device(uint vendor, struct pci_dev* from); | ||
326 | #endif | ||
327 | |||
328 | #if defined __ia64__ | 316 | #if defined __ia64__ |
329 | static void adpt_ia64_info(sysInfo_S* si); | 317 | static void adpt_ia64_info(sysInfo_S* si); |
330 | #endif | 318 | #endif |