diff options
| author | Dave Airlie <airlied@starflyer.(none)> | 2006-01-03 02:18:01 -0500 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2006-01-03 02:18:01 -0500 |
| commit | 97f2aab6698f3ab2552c41c1024a65ffd0763a6d (patch) | |
| tree | bb6e3b2949459f54f884c710fc74d40eef00d834 /drivers/scsi/mca_53c9x.c | |
| parent | d985c1088146607532093d9eaaaf99758f6a4d21 (diff) | |
| parent | 88026842b0a760145aa71d69e74fbc9ec118ca44 (diff) | |
drm: merge in Linus mainline
Diffstat (limited to 'drivers/scsi/mca_53c9x.c')
| -rw-r--r-- | drivers/scsi/mca_53c9x.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/mca_53c9x.c b/drivers/scsi/mca_53c9x.c index 194c75451faf..998a8bbc1a4b 100644 --- a/drivers/scsi/mca_53c9x.c +++ b/drivers/scsi/mca_53c9x.c | |||
| @@ -103,7 +103,7 @@ static volatile unsigned char cmd_buffer[16]; | |||
| 103 | static struct ESP_regs eregs; | 103 | static struct ESP_regs eregs; |
| 104 | 104 | ||
| 105 | /***************************************************************** Detection */ | 105 | /***************************************************************** Detection */ |
| 106 | static int mca_esp_detect(Scsi_Host_Template *tpnt) | 106 | static int mca_esp_detect(struct scsi_host_template *tpnt) |
| 107 | { | 107 | { |
| 108 | struct NCR_ESP *esp; | 108 | struct NCR_ESP *esp; |
| 109 | static int io_port_by_pos[] = MCA_53C9X_IO_PORTS; | 109 | static int io_port_by_pos[] = MCA_53C9X_IO_PORTS; |
| @@ -444,7 +444,7 @@ static void dma_led_off(struct NCR_ESP *esp) | |||
| 444 | outb(inb(PS2_SYS_CTR) & 0x3f, PS2_SYS_CTR); | 444 | outb(inb(PS2_SYS_CTR) & 0x3f, PS2_SYS_CTR); |
| 445 | } | 445 | } |
| 446 | 446 | ||
| 447 | static Scsi_Host_Template driver_template = { | 447 | static struct scsi_host_template driver_template = { |
| 448 | .proc_name = "mca_53c9x", | 448 | .proc_name = "mca_53c9x", |
| 449 | .name = "NCR 53c9x SCSI", | 449 | .name = "NCR 53c9x SCSI", |
| 450 | .detect = mca_esp_detect, | 450 | .detect = mca_esp_detect, |