summaryrefslogtreecommitdiffstats
path: root/drivers/block/ide-proc.c
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>1999-10-09 00:00:47 +0000
committerRalf Baechle <ralf@linux-mips.org>1999-10-09 00:00:47 +0000
commitd6434e1042f3b0a6dfe1b1f615af369486f9b1fa (patch)
treee2be02f33984c48ec019c654051d27964e42c441 /drivers/block/ide-proc.c
parent609d1e803baf519487233b765eb487f9ec227a18 (diff)
Merge with 2.3.19.
Diffstat (limited to 'drivers/block/ide-proc.c')
-rw-r--r--drivers/block/ide-proc.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/block/ide-proc.c b/drivers/block/ide-proc.c
index 623ac9268..8afe1568f 100644
--- a/drivers/block/ide-proc.c
+++ b/drivers/block/ide-proc.c
@@ -243,6 +243,7 @@ static int proc_ide_write_config
}
#endif /* CONFIG_BLK_DEV_IDEPCI */
} else { /* not pci */
+#ifndef CONFIG_Q40
switch (digits) {
case 2: outb(val, reg);
break;
@@ -251,6 +252,7 @@ static int proc_ide_write_config
case 8: outl(val, reg);
break;
}
+#endif /* CONFIG_Q40 */
}
}
}