diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-03-12 23:15:27 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-03-12 23:15:27 +0000 |
| commit | ae38fd1e4c98588314a42097c5a5e77dcef23561 (patch) | |
| tree | f9f10c203bb9e5fbad4810d1f8774c08dfad20ff /drivers/scsi/pci2220i.c | |
| parent | 466a823d79f41d0713b272e48fd73e494b0588e0 (diff) | |
Merge with Linux 2.3.50.
Diffstat (limited to 'drivers/scsi/pci2220i.c')
| -rw-r--r-- | drivers/scsi/pci2220i.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/scsi/pci2220i.c b/drivers/scsi/pci2220i.c index b84ff1723..57ade7eec 100644 --- a/drivers/scsi/pci2220i.c +++ b/drivers/scsi/pci2220i.c @@ -47,6 +47,7 @@ #include <linux/kdev_t.h> #include <linux/blk.h> #include <linux/timer.h> +#include <linux/spinlock.h> #include <asm/dma.h> #include <asm/system.h> #include <asm/io.h> @@ -55,12 +56,6 @@ #include "pci2220i.h" #include "psi_dale.h" -#if LINUX_VERSION_CODE >= LINUXVERSION(2,1,95) -#include <asm/spinlock.h> -#endif -#if LINUX_VERSION_CODE < LINUXVERSION(2,1,93) -#include <linux/bios32.h> -#endif #define PCI2220I_VERSION "2.00" #define READ_CMD IDE_CMD_READ_MULTIPLE |