diff options
author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-29 22:30:03 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-29 22:30:03 -0400 |
commit | 79158229b09873ca296ac53de5c952488f944646 (patch) | |
tree | 5ebf559f71fd4f4e4cbf12f5cd97242da53d9af7 /drivers/scsi/sata_sis.c | |
parent | 7ce54e3f428b33af714271140601c87b8bf2c544 (diff) | |
parent | 7238cfb3342078ad6d1dd06c7b567da428672476 (diff) |
Automatic merge of 'misc-fixes' branch from
rsync://rsync.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev
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 = { |