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/arm/oak.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/arm/oak.c')
-rw-r--r-- | drivers/scsi/arm/oak.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/arm/oak.c b/drivers/scsi/arm/oak.c index de24bb991f1d..d806b024c3bd 100644 --- a/drivers/scsi/arm/oak.c +++ b/drivers/scsi/arm/oak.c | |||
@@ -111,7 +111,7 @@ printk("reading %p len %d\n", addr, len); | |||
111 | 111 | ||
112 | #include "../NCR5380.c" | 112 | #include "../NCR5380.c" |
113 | 113 | ||
114 | static Scsi_Host_Template oakscsi_template = { | 114 | static struct scsi_host_template oakscsi_template = { |
115 | .module = THIS_MODULE, | 115 | .module = THIS_MODULE, |
116 | .proc_info = oakscsi_proc_info, | 116 | .proc_info = oakscsi_proc_info, |
117 | .name = "Oak 16-bit SCSI", | 117 | .name = "Oak 16-bit SCSI", |