diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-12-03 23:59:07 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-12-03 23:59:07 -0500 |
| commit | 79acbb3ff2d8095b692e1502b9eb2ccec348de26 (patch) | |
| tree | 6ab773e5a8f9de2cd6443362b21d0d6fffe3b35e /drivers/ata/pata_pcmcia.c | |
| parent | 19a79859e168640f8e16d7b216d211c1c52b687a (diff) | |
| parent | 2b5f6dcce5bf94b9b119e9ed8d537098ec61c3d2 (diff) | |
Merge branch 'linux-2.6' into for-linus
Diffstat (limited to 'drivers/ata/pata_pcmcia.c')
| -rw-r--r-- | drivers/ata/pata_pcmcia.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/ata/pata_pcmcia.c b/drivers/ata/pata_pcmcia.c index e93ea2702c73..999922de476e 100644 --- a/drivers/ata/pata_pcmcia.c +++ b/drivers/ata/pata_pcmcia.c | |||
| @@ -69,6 +69,7 @@ static struct scsi_host_template pcmcia_sht = { | |||
| 69 | .proc_name = DRV_NAME, | 69 | .proc_name = DRV_NAME, |
| 70 | .dma_boundary = ATA_DMA_BOUNDARY, | 70 | .dma_boundary = ATA_DMA_BOUNDARY, |
| 71 | .slave_configure = ata_scsi_slave_config, | 71 | .slave_configure = ata_scsi_slave_config, |
| 72 | .slave_destroy = ata_scsi_slave_destroy, | ||
| 72 | .bios_param = ata_std_bios_param, | 73 | .bios_param = ata_std_bios_param, |
| 73 | }; | 74 | }; |
| 74 | 75 | ||