diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-06-17 13:25:08 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-06-17 13:25:08 +0000 |
| commit | 59223edaa18759982db0a8aced0e77457d10c68e (patch) | |
| tree | 89354903b01fa0a447bffeefe00df3044495db2e /drivers/block/ide-floppy.c | |
| parent | db7d4daea91e105e3859cf461d7e53b9b77454b2 (diff) | |
Merge with Linux 2.3.6. Sorry, this isn't tested on silicon, I don't
have a MIPS box at hand.
Diffstat (limited to 'drivers/block/ide-floppy.c')
| -rw-r--r-- | drivers/block/ide-floppy.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/block/ide-floppy.c b/drivers/block/ide-floppy.c index 30c862f11..78aa7fe29 100644 --- a/drivers/block/ide-floppy.c +++ b/drivers/block/ide-floppy.c @@ -44,6 +44,7 @@ #include <linux/genhd.h> #include <linux/malloc.h> #include <linux/cdrom.h> +#include <linux/ide.h> #include <asm/byteorder.h> #include <asm/irq.h> @@ -53,11 +54,6 @@ #include <asm/bitops.h> /* - * Main Linux ide driver include file - */ -#include "ide.h" - -/* * The following are used to debug the driver. */ #define IDEFLOPPY_DEBUG_LOG 0 @@ -1011,7 +1007,8 @@ static void idefloppy_issue_pc (ide_drive_t *drive, idefloppy_pc_t *pc) dma_ok=!HWIF(drive)->dmaproc(test_bit (PC_WRITING, &pc->flags) ? ide_dma_write : ide_dma_read, drive); #endif /* CONFIG_BLK_DEV_IDEDMA */ - OUT_BYTE (drive->ctl,IDE_CONTROL_REG); + if (IDE_CONTROL_REG) + OUT_BYTE (drive->ctl,IDE_CONTROL_REG); OUT_BYTE (dma_ok ? 1:0,IDE_FEATURE_REG); /* Use PIO/DMA */ OUT_BYTE (bcount.b.high,IDE_BCOUNTH_REG); OUT_BYTE (bcount.b.low,IDE_BCOUNTL_REG); |