diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-11 17:04:37 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-11 17:04:37 -0500 |
commit | d72d6f1b5647258e83819b51f72fe37e2b7d7965 (patch) | |
tree | d3a08af50624d9b3e2287367b7e9f5fcc93bdce5 /drivers/scsi/amiga7xx.c | |
parent | 33ddcbbfb1d9f1bf1259531ae0ba8400ea3c8ba1 (diff) | |
parent | 8a87a0b6313109d2fea87b1271d497c954ce2ca8 (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-for-linus-2.6
Diffstat (limited to 'drivers/scsi/amiga7xx.c')
-rw-r--r-- | drivers/scsi/amiga7xx.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/scsi/amiga7xx.c b/drivers/scsi/amiga7xx.c index dea8446f5360..c0844fa32c5d 100644 --- a/drivers/scsi/amiga7xx.c +++ b/drivers/scsi/amiga7xx.c | |||
@@ -29,7 +29,7 @@ | |||
29 | #include "amiga7xx.h" | 29 | #include "amiga7xx.h" |
30 | 30 | ||
31 | 31 | ||
32 | static int amiga7xx_register_one(Scsi_Host_Template *tpnt, | 32 | static int amiga7xx_register_one(struct scsi_host_template *tpnt, |
33 | unsigned long address) | 33 | unsigned long address) |
34 | { | 34 | { |
35 | long long options; | 35 | long long options; |
@@ -65,7 +65,7 @@ static struct { | |||
65 | { 0 } | 65 | { 0 } |
66 | }; | 66 | }; |
67 | 67 | ||
68 | static int __init amiga7xx_zorro_detect(Scsi_Host_Template *tpnt) | 68 | static int __init amiga7xx_zorro_detect(struct scsi_host_template *tpnt) |
69 | { | 69 | { |
70 | int num = 0, i; | 70 | int num = 0, i; |
71 | struct zorro_dev *z = NULL; | 71 | struct zorro_dev *z = NULL; |
@@ -89,7 +89,7 @@ static int __init amiga7xx_zorro_detect(Scsi_Host_Template *tpnt) | |||
89 | #endif /* CONFIG_ZORRO */ | 89 | #endif /* CONFIG_ZORRO */ |
90 | 90 | ||
91 | 91 | ||
92 | int __init amiga7xx_detect(Scsi_Host_Template *tpnt) | 92 | int __init amiga7xx_detect(struct scsi_host_template *tpnt) |
93 | { | 93 | { |
94 | static unsigned char called = 0; | 94 | static unsigned char called = 0; |
95 | int num = 0; | 95 | int num = 0; |
@@ -122,7 +122,7 @@ static int amiga7xx_release(struct Scsi_Host *shost) | |||
122 | return 0; | 122 | return 0; |
123 | } | 123 | } |
124 | 124 | ||
125 | static Scsi_Host_Template driver_template = { | 125 | static struct scsi_host_template driver_template = { |
126 | .name = "Amiga NCR53c710 SCSI", | 126 | .name = "Amiga NCR53c710 SCSI", |
127 | .detect = amiga7xx_detect, | 127 | .detect = amiga7xx_detect, |
128 | .release = amiga7xx_release, | 128 | .release = amiga7xx_release, |