diff options
| author | Felix Blyakher <felixb@sgi.com> | 2009-04-01 17:58:39 -0400 |
|---|---|---|
| committer | Felix Blyakher <felixb@sgi.com> | 2009-04-01 17:58:39 -0400 |
| commit | f36345ff9a4a77f2cc576a2777b6256d5c8798fa (patch) | |
| tree | 7ae4c607f6baae74060c2e385f744e171fbbf92b /drivers/ide/q40ide.c | |
| parent | 1aacc064e029f0017384e463121b98f06d3a2cc3 (diff) | |
| parent | 8b53ef33d9d8fa5f771ae11cc6a6e7bc0182beec (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
Diffstat (limited to 'drivers/ide/q40ide.c')
| -rw-r--r-- | drivers/ide/q40ide.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ide/q40ide.c b/drivers/ide/q40ide.c index 2a43a2f49633..d007e7f66598 100644 --- a/drivers/ide/q40ide.c +++ b/drivers/ide/q40ide.c | |||
| @@ -99,9 +99,9 @@ static const struct ide_tp_ops q40ide_tp_ops = { | |||
| 99 | .exec_command = ide_exec_command, | 99 | .exec_command = ide_exec_command, |
| 100 | .read_status = ide_read_status, | 100 | .read_status = ide_read_status, |
| 101 | .read_altstatus = ide_read_altstatus, | 101 | .read_altstatus = ide_read_altstatus, |
| 102 | .write_devctl = ide_write_devctl, | ||
| 102 | 103 | ||
| 103 | .set_irq = ide_set_irq, | 104 | .dev_select = ide_dev_select, |
| 104 | |||
| 105 | .tf_load = ide_tf_load, | 105 | .tf_load = ide_tf_load, |
| 106 | .tf_read = ide_tf_read, | 106 | .tf_read = ide_tf_read, |
| 107 | 107 | ||