diff options
| author | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-01 16:46:22 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-01 16:46:22 -0800 |
| commit | 9ba5aa3126873a9c29999b78de20a52c5f87d389 (patch) | |
| tree | 5ee7cc2c3465c3ef557f6f4e35e6c7cb67ece286 /drivers/ata/pata_serverworks.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_serverworks.c')
| -rw-r--r-- | drivers/ata/pata_serverworks.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/ata/pata_serverworks.c b/drivers/ata/pata_serverworks.c index 5bbf76ec14a..be7f60efcb6 100644 --- a/drivers/ata/pata_serverworks.c +++ b/drivers/ata/pata_serverworks.c @@ -325,6 +325,7 @@ static struct scsi_host_template serverworks_sht = { .proc_name = DRV_NAME, .dma_boundary = ATA_DMA_BOUNDARY, .slave_configure = ata_scsi_slave_config, + .slave_destroy = ata_scsi_slave_destroy, .bios_param = ata_std_bios_param, }; |