aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide/ide-io.c
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-01-25 16:17:08 -0500
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-01-25 16:17:08 -0500
commit4ee06b7e677da4c75f2fcc5fd850543852d18bf2 (patch)
tree0c7c4b1e2be3179cc25e95f4148577cd9047e398 /drivers/ide/ide-io.c
parentf1ca6d37f991347b87d86430db42e2ab139d1b1d (diff)
ide: remove stale ide.h "configuration options"
Remove stale ide.h "configuration options": * INITIAL_MULT_COUNT - always defined to 0 * SUPPORT_SLOW_DATA_PORTS - unused * OK_TO_RESET_CONTROLLER - always defined to 1 * DISABLE_IRQ_NOSYNC - always defined to 0 Leave SUPPORT_VLB_SYNC (defined to 0 for CRIS and FRV, otherwise to 1) for now but disallow overriding it by <asm/ide.h>. There should be no functionality changes caused by this patch. Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/ide-io.c')
-rw-r--r--drivers/ide/ide-io.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c
index 33458fe7f490..4ea8419feeec 100644
--- a/drivers/ide/ide-io.c
+++ b/drivers/ide/ide-io.c
@@ -1469,12 +1469,8 @@ void ide_timer_expiry (unsigned long data)
1469 */ 1469 */
1470 spin_unlock(&ide_lock); 1470 spin_unlock(&ide_lock);
1471 hwif = HWIF(drive); 1471 hwif = HWIF(drive);
1472#if DISABLE_IRQ_NOSYNC
1473 disable_irq_nosync(hwif->irq);
1474#else
1475 /* disable_irq_nosync ?? */ 1472 /* disable_irq_nosync ?? */
1476 disable_irq(hwif->irq); 1473 disable_irq(hwif->irq);
1477#endif /* DISABLE_IRQ_NOSYNC */
1478 /* local CPU only, 1474 /* local CPU only,
1479 * as if we were handling an interrupt */ 1475 * as if we were handling an interrupt */
1480 local_irq_disable(); 1476 local_irq_disable();