summaryrefslogtreecommitdiffstats
path: root/drivers/usb/image
diff options
context:
space:
mode:
authorSteve French <sfrench@us.ibm.com>2005-11-12 19:53:33 -0800
committerSteve French <sfrench@us.ibm.com>2005-11-12 19:53:33 -0800
commit1b98a8221e3c9c86ae7e292ba7542d2dd6f10eb9 (patch)
tree2e0051ccb147b0553d50c14681c50881098859d6 /drivers/usb/image
parente89dc9209692293434da45ec31826a55becb91c0 (diff)
parent9e6c67fd2716720d9029d38ea25884efcfdedeb6 (diff)
downloadkernel-crypto-1b98a8221e3c9c86ae7e292ba7542d2dd6f10eb9.tar.gz
kernel-crypto-1b98a8221e3c9c86ae7e292ba7542d2dd6f10eb9.tar.xz
kernel-crypto-1b98a8221e3c9c86ae7e292ba7542d2dd6f10eb9.zip
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'drivers/usb/image')
-rw-r--r--drivers/usb/image/microtek.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/image/microtek.c b/drivers/usb/image/microtek.c
index c89d0769b3d..61a2604cce4 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",