diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-10-09 00:00:47 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-10-09 00:00:47 +0000 |
| commit | d6434e1042f3b0a6dfe1b1f615af369486f9b1fa (patch) | |
| tree | e2be02f33984c48ec019c654051d27964e42c441 /drivers/scsi/inia100.c | |
| parent | 609d1e803baf519487233b765eb487f9ec227a18 (diff) | |
Merge with 2.3.19.
Diffstat (limited to 'drivers/scsi/inia100.c')
| -rw-r--r-- | drivers/scsi/inia100.c | 29 |
1 files changed, 21 insertions, 8 deletions
diff --git a/drivers/scsi/inia100.c b/drivers/scsi/inia100.c index 870b24e6c..eab18bad1 100644 --- a/drivers/scsi/inia100.c +++ b/drivers/scsi/inia100.c @@ -73,41 +73,54 @@ #if LINUX_VERSION_CODE >= CVT_LINUX_VERSION(1,3,0) #include <stdarg.h> +#include <asm/io.h> #include <asm/irq.h> +#include <linux/string.h> #include <linux/errno.h> +#include <linux/kernel.h> +#include <linux/ioport.h> #include <linux/delay.h> +#include <linux/sched.h> #if LINUX_VERSION_CODE <= CVT_LINUX_VERSION(2,1,92) #include <linux/bios32.h> #endif #include <linux/pci.h> +#include <linux/proc_fs.h> #if LINUX_VERSION_CODE >= CVT_LINUX_VERSION(2,1,23) #include <linux/init.h> #endif #include <linux/blk.h> #if LINUX_VERSION_CODE >= CVT_LINUX_VERSION(2,1,95) -#include <asm/spinlock.h> +#include <linux/spinlock.h> #endif +#include "sd.h" +#include "scsi.h" +#include "hosts.h" +#include "inia100.h" #include <linux/stat.h> +#include <linux/malloc.h> +#include <linux/config.h> + #else +#include <linux/kernel.h> #include <linux/head.h> #include <linux/types.h> -#include <asm/system.h> -#include "../block/blk.h" -#endif - -#include <linux/kernel.h> #include <linux/string.h> #include <linux/ioport.h> + #include <linux/sched.h> #include <linux/proc_fs.h> +#include <asm/system.h> #include <asm/io.h> +#include "../block/blk.h" #include "scsi.h" #include "sd.h" #include "hosts.h" #include <linux/malloc.h> #include "inia100.h" +#endif #ifdef MODULE Scsi_Host_Template driver_template = INIA100; @@ -119,7 +132,7 @@ Scsi_Host_Template driver_template = INIA100; char *inia100_Copyright = "Copyright (C) 1998-99"; char *inia100_InitioName = "by Initio Corporation"; char *inia100_ProductName = "INI-A100U2W"; -char *inia100_Version = "v1.02a"; +char *inia100_Version = "v1.02c"; #if LINUX_VERSION_CODE >= CVT_LINUX_VERSION(1,3,0) struct proc_dir_entry proc_scsi_inia100 = @@ -330,7 +343,7 @@ int orc_ReturnNumberOfAdapters(void) #if LINUX_VERSION_CODE > CVT_LINUX_VERSION(2,1,92) bPCIBusNum = pdev->bus->number; bPCIDeviceNum = pdev->devfn; - dRegValue = pdev->base_address[0]; + dRegValue = pdev->resource[0].start; if (dRegValue == -1) { /* Check return code */ printk("\n\rinia100: orchid read configuration error.\n"); return (0); /* Read configuration space error */ |