patch-2.3.1 linux/drivers/block/ide-floppy.c

• Lines: 30
• Date: Thu May 13 11:04:54 1999
• Orig file: v2.3.0/linux/drivers/block/ide-floppy.c
• Orig date: Wed Dec 23 07:54:22 1998

diff -u --recursive --new-file v2.3.0/linux/drivers/block/ide-floppy.c linux/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 @@
 		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);