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/usb | |
| 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/usb')
| -rw-r--r-- | drivers/usb/image/microtek.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/image/microtek.c b/drivers/usb/image/microtek.c index c89d0769b3da..61a2604cce4f 100644 --- a/drivers/usb/image/microtek.c +++ b/drivers/usb/image/microtek.c | |||
| @@ -632,7 +632,7 @@ out: | |||
| 632 | return err; | 632 | return err; |
| 633 | } | 633 | } |
| 634 | 634 | ||
| 635 | static Scsi_Host_Template mts_scsi_host_template = { | 635 | static struct scsi_host_template mts_scsi_host_template = { |
| 636 | .module = THIS_MODULE, | 636 | .module = THIS_MODULE, |
| 637 | .name = "microtekX6", | 637 | .name = "microtekX6", |
| 638 | .proc_name = "microtekX6", | 638 | .proc_name = "microtekX6", |