diff options
| author | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-01 19:46:22 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-01 19:46:22 -0500 |
| commit | 9ba5aa3126873a9c29999b78de20a52c5f87d389 (patch) | |
| tree | 5ee7cc2c3465c3ef557f6f4e35e6c7cb67ece286 /drivers/ata/pata_netcell.c | |
| parent | c3e59d1e891f6140a346de2b8547e25133c716b0 (diff) | |
| parent | a17259a726c4c9806dc99bda5e904727de76b694 (diff) | |
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
[PATCH] libata: add missing sht->slave_destroy
[PATCH] ahci: ignore PORT_IRQ_IF_ERR on JMB controllers
Diffstat (limited to 'drivers/ata/pata_netcell.c')
| -rw-r--r-- | drivers/ata/pata_netcell.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/ata/pata_netcell.c b/drivers/ata/pata_netcell.c index f5672de99c22..1963a4d35873 100644 --- a/drivers/ata/pata_netcell.c +++ b/drivers/ata/pata_netcell.c | |||
| @@ -62,6 +62,7 @@ static struct scsi_host_template netcell_sht = { | |||
| 62 | .proc_name = DRV_NAME, | 62 | .proc_name = DRV_NAME, |
| 63 | .dma_boundary = ATA_DMA_BOUNDARY, | 63 | .dma_boundary = ATA_DMA_BOUNDARY, |
| 64 | .slave_configure = ata_scsi_slave_config, | 64 | .slave_configure = ata_scsi_slave_config, |
| 65 | .slave_destroy = ata_scsi_slave_destroy, | ||
| 65 | /* Use standard CHS mapping rules */ | 66 | /* Use standard CHS mapping rules */ |
| 66 | .bios_param = ata_std_bios_param, | 67 | .bios_param = ata_std_bios_param, |
| 67 | }; | 68 | }; |