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/dec_esp.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/dec_esp.c')
-rw-r--r-- | drivers/scsi/dec_esp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/dec_esp.c b/drivers/scsi/dec_esp.c index 256d6baf8df3..a35ee43a48df 100644 --- a/drivers/scsi/dec_esp.c +++ b/drivers/scsi/dec_esp.c | |||
@@ -133,7 +133,7 @@ static struct scsi_host_template driver_template = { | |||
133 | #include "scsi_module.c" | 133 | #include "scsi_module.c" |
134 | 134 | ||
135 | /***************************************************************** Detection */ | 135 | /***************************************************************** Detection */ |
136 | static int dec_esp_detect(Scsi_Host_Template * tpnt) | 136 | static int dec_esp_detect(struct scsi_host_template * tpnt) |
137 | { | 137 | { |
138 | struct NCR_ESP *esp; | 138 | struct NCR_ESP *esp; |
139 | struct ConfigDev *esp_dev; | 139 | struct ConfigDev *esp_dev; |