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/mac_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/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) | |||
| 300 | * Model dependent ESP setup | 300 | * Model dependent ESP setup |
| 301 | */ | 301 | */ |
| 302 | 302 | ||
| 303 | int mac_esp_detect(Scsi_Host_Template * tpnt) | 303 | int mac_esp_detect(struct scsi_host_template * tpnt) |
| 304 | { | 304 | { |
| 305 | int quick = 0; | 305 | int quick = 0; |
| 306 | int chipnum, chipspresent = 0; | 306 | int chipnum, chipspresent = 0; |
| @@ -730,7 +730,7 @@ static void dma_setup_quick(struct NCR_ESP * esp, __u32 addr, int count, int wri | |||
| 730 | #endif | 730 | #endif |
| 731 | } | 731 | } |
| 732 | 732 | ||
| 733 | static Scsi_Host_Template driver_template = { | 733 | static struct scsi_host_template driver_template = { |
| 734 | .proc_name = "mac_esp", | 734 | .proc_name = "mac_esp", |
| 735 | .name = "Mac 53C9x SCSI", | 735 | .name = "Mac 53C9x SCSI", |
| 736 | .detect = mac_esp_detect, | 736 | .detect = mac_esp_detect, |