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/scsi/cyberstormII.c | |
| parent | 33ddcbbfb1d9f1bf1259531ae0ba8400ea3c8ba1 (diff) | |
| parent | 8a87a0b6313109d2fea87b1271d497c954ce2ca8 (diff) | |
| download | olio-linux-3.10-d72d6f1b5647258e83819b51f72fe37e2b7d7965.tar.xz olio-linux-3.10-d72d6f1b5647258e83819b51f72fe37e2b7d7965.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-for-linus-2.6
Diffstat (limited to 'drivers/scsi/cyberstormII.c')
| -rw-r--r-- | drivers/scsi/cyberstormII.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/cyberstormII.c b/drivers/scsi/cyberstormII.c index 845d9259821..a3caabfd755 100644 --- a/drivers/scsi/cyberstormII.c +++ b/drivers/scsi/cyberstormII.c @@ -81,7 +81,7 @@ static volatile unsigned char cmd_buffer[16]; */ /***************************************************************** Detection */ -int __init cyberII_esp_detect(Scsi_Host_Template *tpnt) +int __init cyberII_esp_detect(struct scsi_host_template *tpnt) { struct NCR_ESP *esp; struct zorro_dev *z = NULL; @@ -290,7 +290,7 @@ int cyberII_esp_release(struct Scsi_Host *instance) } -static Scsi_Host_Template driver_template = { +static struct scsi_host_template driver_template = { .proc_name = "esp-cyberstormII", .proc_info = esp_proc_info, .name = "CyberStorm Mk II SCSI", |