Re: ac7 in function ide_unregister

From: Niels Kristian Bech Jensen (nkbj@image.dk)
Date: Thu Jun 01 2000 - 04:41:48 EST


On Wed, 31 May 2000, Garst R. Reese wrote:

> undefined reference to ide_release_dma
>
Here's a fix:

diff -u --recursive --new-file linux-2.4.0-test1-ac7/drivers/ide/Config.in linux/drivers/ide/Config.in
--- linux-2.4.0-test1-ac7/drivers/ide/Config.in Thu Jun 1 11:16:50 2000
+++ linux/drivers/ide/Config.in Thu Jun 1 11:21:52 2000
@@ -140,9 +140,9 @@
 fi
 
 if [ "$CONFIG_BLK_DEV_TIVO" = "y" ]; then
- define CONFIG_DMA_NONPCI y
+ define_bool CONFIG_DMA_NONPCI y
 else
- define CONFIG_DMA_NONPCI n
+ define_bool CONFIG_DMA_NONPCI n
 fi
 if [ "$CONFIG_IDE_CHIPSETS" = "y" -o \
      "$CONFIG_BLK_DEV_AEC62XX" = "y" -o \
diff -u --recursive --new-file linux-2.4.0-test1-ac7/drivers/ide/ide.c linux/drivers/ide/ide.c
--- linux-2.4.0-test1-ac7/drivers/ide/ide.c Thu Jun 1 11:16:51 2000
+++ linux/drivers/ide/ide.c Thu Jun 1 11:22:52 2000
@@ -2012,12 +2012,12 @@
         else
                 hwgroup->hwif = HWIF(hwgroup->drive);
 
-#ifndef CONFIG_DMA_NONPCI
+#if defined(CONFIG_BLK_DEV_IDEDMA) && !defined(CONFIG_DMA_NONPCI)
         if (hwif->dma_base) {
                 (void) ide_release_dma(hwif);
                 hwif->dma_base = 0;
         }
-#endif /* CONFIG_DMA_NONPCI */
+#endif /* (CONFIG_BLK_DEV_IDEDMA) && !(CONFIG_DMA_NONPCI) */
 
         /*
          * Remove us from the kernel's knowledge

-- 
Niels Kristian Bech Jensen -- nkbj@image.dk -- http://www.image.dk/~nkbj/

----------->> Stop software piracy --- use free software! <<-----------

- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.rutgers.edu Please read the FAQ at http://www.tux.org/lkml/



This archive was generated by hypermail 2b29 : Wed Jun 07 2000 - 21:00:12 EST