summaryrefslogtreecommitdiffstats
path: root/drivers/ide/q40ide.c
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2009-04-02 11:17:41 +0900
committerPaul Mundt <lethal@linux-sh.org>2009-04-02 11:17:41 +0900
commitc4361bb64b81f5b81a7a08d58654493385a2f2b2 (patch)
tree8741c0b60ddfbc3fc4e17c8d200f6aa6ff32cca0 /drivers/ide/q40ide.c
parent46368fa05164e1afdc1401294908cf30c6d8d981 (diff)
parent833bb3046b6cb320e775ea2160ddca87d53260d5 (diff)
downloadkernel-crypto-c4361bb64b81f5b81a7a08d58654493385a2f2b2.tar.gz
kernel-crypto-c4361bb64b81f5b81a7a08d58654493385a2f2b2.tar.xz
kernel-crypto-c4361bb64b81f5b81a7a08d58654493385a2f2b2.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/ide/q40ide.c')
-rw-r--r--drivers/ide/q40ide.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ide/q40ide.c b/drivers/ide/q40ide.c
index 2a43a2f4963..d007e7f6659 100644
--- a/drivers/ide/q40ide.c
+++ b/drivers/ide/q40ide.c
@@ -99,9 +99,9 @@ static const struct ide_tp_ops q40ide_tp_ops = {
.exec_command = ide_exec_command,
.read_status = ide_read_status,
.read_altstatus = ide_read_altstatus,
+ .write_devctl = ide_write_devctl,
- .set_irq = ide_set_irq,
-
+ .dev_select = ide_dev_select,
.tf_load = ide_tf_load,
.tf_read = ide_tf_read,