diff options
| author |   Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-11 14:04:37 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-11 14:04:37 -0800 |
| commit | d72d6f1b5647258e83819b51f72fe37e2b7d7965 (patch) | |
| tree | d3a08af50624d9b3e2287367b7e9f5fcc93bdce5 /drivers/usb | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 (diff) | |
| parent | Merge by hand (whitespace conflicts in libata.h) (diff) | |
| download | linux-dev-d72d6f1b5647258e83819b51f72fe37e2b7d7965.tar.xz linux-dev-d72d6f1b5647258e83819b51f72fe37e2b7d7965.zip | |
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: return err; } -static Scsi_Host_Template mts_scsi_host_template = { +static struct scsi_host_template mts_scsi_host_template = { .module = THIS_MODULE, .name = "microtekX6", .proc_name = "microtekX6", |