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/in2000.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/in2000.c')
| -rw-r--r-- | drivers/scsi/in2000.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/in2000.c b/drivers/scsi/in2000.c index fe387b5ce8bd..34daa3e068de 100644 --- a/drivers/scsi/in2000.c +++ b/drivers/scsi/in2000.c | |||
| @@ -1899,7 +1899,7 @@ static int int_tab[] in2000__INITDATA = { | |||
| 1899 | }; | 1899 | }; |
| 1900 | 1900 | ||
| 1901 | 1901 | ||
| 1902 | static int __init in2000_detect(Scsi_Host_Template * tpnt) | 1902 | static int __init in2000_detect(struct scsi_host_template * tpnt) |
| 1903 | { | 1903 | { |
| 1904 | struct Scsi_Host *instance; | 1904 | struct Scsi_Host *instance; |
| 1905 | struct IN2000_hostdata *hostdata; | 1905 | struct IN2000_hostdata *hostdata; |
| @@ -2305,7 +2305,7 @@ static int in2000_proc_info(struct Scsi_Host *instance, char *buf, char **start, | |||
| 2305 | MODULE_LICENSE("GPL"); | 2305 | MODULE_LICENSE("GPL"); |
| 2306 | 2306 | ||
| 2307 | 2307 | ||
| 2308 | static Scsi_Host_Template driver_template = { | 2308 | static struct scsi_host_template driver_template = { |
| 2309 | .proc_name = "in2000", | 2309 | .proc_name = "in2000", |
| 2310 | .proc_info = in2000_proc_info, | 2310 | .proc_info = in2000_proc_info, |
| 2311 | .name = "Always IN2000", | 2311 | .name = "Always IN2000", |