diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-12 07:39:35 +0300 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-12 07:39:35 +0300 |
| commit | f4256e301d9800b1e0276404cb01b3ac85b51067 (patch) | |
| tree | 975f56627b78f757608b31684311a24ca1478481 /drivers/scsi/a2091.c | |
| parent | fb2a26b9f8f5eda6b96ba9753edf105e5999d6d9 (diff) | |
| parent | cd52d1ee9a92587b242d946a2300a3245d3b885a (diff) | |
| download | linux-f4256e301d9800b1e0276404cb01b3ac85b51067.tar.xz | |
Merge branch 'master'
Diffstat (limited to 'drivers/scsi/a2091.c')
| -rw-r--r-- | drivers/scsi/a2091.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/scsi/a2091.c b/drivers/scsi/a2091.c index f7a1751e892d..54996eaae979 100644 --- a/drivers/scsi/a2091.c +++ b/drivers/scsi/a2091.c @@ -2,7 +2,6 @@ #include <linux/mm.h> #include <linux/blkdev.h> #include <linux/sched.h> -#include <linux/version.h> #include <linux/init.h> #include <linux/interrupt.h> @@ -173,7 +172,7 @@ static void dma_stop (struct Scsi_Host *instance, Scsi_Cmnd *SCpnt, } } -int __init a2091_detect(Scsi_Host_Template *tpnt) +int __init a2091_detect(struct scsi_host_template *tpnt) { static unsigned char called = 0; struct Scsi_Host *instance; @@ -234,7 +233,7 @@ static int a2091_bus_reset(Scsi_Cmnd *cmd) #define HOSTS_C -static Scsi_Host_Template driver_template = { +static struct scsi_host_template driver_template = { .proc_name = "A2901", .name = "Commodore A2091/A590 SCSI", .detect = a2091_detect, |