patch-2.3.99-pre3 linux/drivers/ide/ns87415.c

• Lines: 46
• Date: Wed Mar 22 22:22:05 2000
• Orig file: v2.3.99-pre2/linux/drivers/ide/ns87415.c
• Orig date: Tue Mar 14 19:10:39 2000

diff -u --recursive --new-file v2.3.99-pre2/linux/drivers/ide/ns87415.c linux/drivers/ide/ns87415.c
@@ -1,12 +1,14 @@
 /*
- * linux/drivers/block/ns87415.c		Version 1.00  December 7, 1997
+ * linux/drivers/ide/ns87415.c		Version 1.01  Mar. 18, 2000
  *
- * Copyright (C) 1997-1998  Mark Lord
- * Copyright (C) 1998       Eddie C. Dost  (ecd@skynet.be)
+ * Copyright (C) 1997-1998	Mark Lord <mlord@pobox.com>
+ * Copyright (C) 1998		Eddie C. Dost <ecd@skynet.be>
+ * Copyright (C) 1999-2000	Andre Hedrick <andre@suse.com>
  *
- * Inspired by an earlier effort from David S. Miller (davem@caipfs.rutgers.edu)
+ * Inspired by an earlier effort from David S. Miller <davem@redhat.com>
  */
 
+#include <linux/config.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/timer.h>
@@ -78,6 +80,7 @@
 	ns87415_prepare_drive (drive, drive->using_dma);
 }
 
+#ifdef CONFIG_BLK_DEV_IDEDMA
 static int ns87415_dmaproc(ide_dma_action_t func, ide_drive_t *drive)
 {
 	ide_hwif_t	*hwif = HWIF(drive);
@@ -106,6 +109,7 @@
 			return ide_dmaproc(func, drive);	/* use standard DMA stuff */
 	}
 }
+#endif /* CONFIG_BLK_DEV_IDEDMA */
 
 void __init ide_init_ns87415 (ide_hwif_t *hwif)
 {
@@ -179,7 +183,10 @@
 	else if (!hwif->irq && hwif->mate && hwif->mate->irq)
 		hwif->irq = hwif->mate->irq;	/* share IRQ with mate */
 
+#ifdef CONFIG_BLK_DEV_IDEDMA
 	if (hwif->dma_base)
 		hwif->dmaproc = &ns87415_dmaproc;
+#endif /* CONFIG_BLK_DEV_IDEDMA */
+
 	hwif->selectproc = &ns87415_selectproc;
 }