diff options
| author | Len Brown <len.brown@intel.com> | 2009-01-09 03:39:43 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-01-09 03:39:43 -0500 |
| commit | b2576e1d4408e134e2188c967b1f28af39cd79d4 (patch) | |
| tree | 004f3c82faab760f304ce031d6d2f572e7746a50 /drivers/ide/ide-h8300.c | |
| parent | 3cc8a5f4ba91f67bbdb81a43a99281a26aab8d77 (diff) | |
| parent | 2150edc6c5cf00f7adb54538b9ea2a3e9cedca3f (diff) | |
Merge branch 'linus' into release
Diffstat (limited to 'drivers/ide/ide-h8300.c')
| -rw-r--r-- | drivers/ide/ide-h8300.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/ide/ide-h8300.c b/drivers/ide/ide-h8300.c index e2cdd2e9cdec..9270d3255ee0 100644 --- a/drivers/ide/ide-h8300.c +++ b/drivers/ide/ide-h8300.c | |||
| @@ -159,7 +159,6 @@ static const struct ide_tp_ops h8300_tp_ops = { | |||
| 159 | .exec_command = ide_exec_command, | 159 | .exec_command = ide_exec_command, |
| 160 | .read_status = ide_read_status, | 160 | .read_status = ide_read_status, |
| 161 | .read_altstatus = ide_read_altstatus, | 161 | .read_altstatus = ide_read_altstatus, |
| 162 | .read_sff_dma_status = ide_read_sff_dma_status, | ||
| 163 | 162 | ||
| 164 | .set_irq = ide_set_irq, | 163 | .set_irq = ide_set_irq, |
| 165 | 164 | ||