diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-12 05:39:35 +0100 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-12 05:39:35 +0100 |
| commit | f4256e301d9800b1e0276404cb01b3ac85b51067 (patch) | |
| tree | 975f56627b78f757608b31684311a24ca1478481 /drivers/scsi/mac_esp.c | |
| parent | Merge branch 'upstream' (diff) | |
| parent | Linux v2.6.15-rc1 (diff) | |
| download | linux-f4256e301d9800b1e0276404cb01b3ac85b51067.tar.xz linux-f4256e301d9800b1e0276404cb01b3ac85b51067.zip | |
Merge branch 'master'
Diffstat (limited to 'drivers/scsi/mac_esp.c')
| -rw-r--r-- | drivers/scsi/mac_esp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/mac_esp.c b/drivers/scsi/mac_esp.c index c94c8db84651..e31fadd61904 100644 --- a/drivers/scsi/mac_esp.c +++ b/drivers/scsi/mac_esp.c @@ -300,7 +300,7 @@ unsigned long get_base(int chip_num) * Model dependent ESP setup */ -int mac_esp_detect(Scsi_Host_Template * tpnt) +int mac_esp_detect(struct scsi_host_template * tpnt) { int quick = 0; int chipnum, chipspresent = 0; @@ -730,7 +730,7 @@ static void dma_setup_quick(struct NCR_ESP * esp, __u32 addr, int count, int wri #endif } -static Scsi_Host_Template driver_template = { +static struct scsi_host_template driver_template = { .proc_name = "mac_esp", .name = "Mac 53C9x SCSI", .detect = mac_esp_detect, |