diff options
| author | Len Brown <len.brown@intel.com> | 2005-12-07 01:31:30 +0300 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-12-07 01:31:30 +0300 |
| commit | 3d5271f9883cba7b54762bc4fe027d4172f06db7 (patch) | |
| tree | ab8a881a14478598a0c8bda0d26c62cdccfffd6d /drivers/scsi/mvme147.c | |
| parent | 378b2556f4e09fa6f87ff0cb5c4395ff28257d02 (diff) | |
| parent | 9115a6c787596e687df03010d97fccc5e0762506 (diff) | |
| download | linux-3d5271f9883cba7b54762bc4fe027d4172f06db7.tar.xz | |
Pull release into acpica branch
Diffstat (limited to 'drivers/scsi/mvme147.c')
| -rw-r--r-- | drivers/scsi/mvme147.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/scsi/mvme147.c b/drivers/scsi/mvme147.c index 2fb31ee6d9f5..cb367c2c5c78 100644 --- a/drivers/scsi/mvme147.c +++ b/drivers/scsi/mvme147.c @@ -2,7 +2,6 @@ #include <linux/mm.h> #include <linux/blkdev.h> #include <linux/sched.h> -#include <linux/version.h> #include <linux/interrupt.h> #include <asm/page.h> @@ -64,7 +63,7 @@ static void dma_stop (struct Scsi_Host *instance, Scsi_Cmnd *SCpnt, m147_pcc->dma_cntrl = 0; } -int mvme147_detect(Scsi_Host_Template *tpnt) +int mvme147_detect(struct scsi_host_template *tpnt) { static unsigned char called = 0; wd33c93_regs regs; @@ -131,7 +130,7 @@ static int mvme147_bus_reset(Scsi_Cmnd *cmd) #include "mvme147.h" -static Scsi_Host_Template driver_template = { +static struct scsi_host_template driver_template = { .proc_name = "MVME147", .name = "MVME147 built-in SCSI", .detect = mvme147_detect, |