diff options
| author | <jgarzik@pretzel.yyz.us> | 2005-05-29 14:24:57 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-05-29 14:24:57 -0400 |
| commit | d582c4ea307873503a68d6d7ab72ee8599e032a9 (patch) | |
| tree | 30b5ea37ba5803fe25815d14ee248be309975cb5 /drivers/scsi/sata_sis.c | |
| parent | 87507cfdd2cde397c9da8f6e7ec23b2b47ec53d6 (diff) | |
| parent | aa8f0dc6c3dbf1cf3ff58f3e945c981be134814d (diff) | |
Automatic merge of /spare/repo/netdev-2.6 branch use-after-unmap
Diffstat (limited to 'drivers/scsi/sata_sis.c')
| -rw-r--r-- | drivers/scsi/sata_sis.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/scsi/sata_sis.c b/drivers/scsi/sata_sis.c index 5105ddd08447..e418b89c6b9d 100644 --- a/drivers/scsi/sata_sis.c +++ b/drivers/scsi/sata_sis.c | |||
| @@ -114,6 +114,7 @@ static struct ata_port_operations sis_ops = { | |||
| 114 | .scr_write = sis_scr_write, | 114 | .scr_write = sis_scr_write, |
| 115 | .port_start = ata_port_start, | 115 | .port_start = ata_port_start, |
| 116 | .port_stop = ata_port_stop, | 116 | .port_stop = ata_port_stop, |
| 117 | .host_stop = ata_host_stop, | ||
| 117 | }; | 118 | }; |
| 118 | 119 | ||
| 119 | static struct ata_port_info sis_port_info = { | 120 | static struct ata_port_info sis_port_info = { |