Index: linux-2.6.17/drivers/block/Kconfig
===================================================================
--- linux-2.6.17.orig/drivers/block/Kconfig	2006-07-08 18:42:38.000000000 -0700
+++ linux-2.6.17/drivers/block/Kconfig	2006-07-08 18:44:01.000000000 -0700
@@ -6,7 +6,7 @@
 
 config BLK_DEV_FD
 	tristate "Normal floppy disk support"
-	depends on ARCH_MAY_HAVE_PC_FDC
+	depends on ARCH_MAY_HAVE_PC_FDC && GENERIC_ISA_DMA
 	---help---
 	  If you want to use the floppy disk drive(s) of your PC under Linux,
 	  say Y. Information about this driver, especially important for IBM
@@ -42,7 +42,7 @@
 
 config BLK_DEV_PS2
 	tristate "PS/2 ESDI hard disk support"
-	depends on MCA && MCA_LEGACY && BROKEN
+	depends on MCA && MCA_LEGACY && BROKEN && GENERIC_ISA_DMA
 	help
 	  Say Y here if you have a PS/2 machine with a MCA bus and an ESDI
 	  hard disk.
@@ -105,7 +105,7 @@
 
 config BLK_DEV_XD
 	tristate "XT hard disk support"
-	depends on ISA && ISA_DMA_API
+	depends on ISA && ISA_DMA_API && GENERIC_ISA_DMA
 	help
 	  Very old 8 bit hard disk controllers used in the IBM XT computer
 	  will be supported if you say Y here.
Index: linux-2.6.17/drivers/char/Kconfig
===================================================================
--- linux-2.6.17.orig/drivers/char/Kconfig	2006-07-08 18:44:19.000000000 -0700
+++ linux-2.6.17/drivers/char/Kconfig	2006-07-08 18:44:39.000000000 -0700
@@ -170,7 +170,7 @@
 
 config ESPSERIAL
 	tristate "Hayes ESP serial port support"
-	depends on SERIAL_NONSTANDARD && ISA && ISA_DMA_API
+	depends on SERIAL_NONSTANDARD && ISA && ISA_DMA_API && GENERIC_ISA_DMA
 	help
 	  This is a driver which supports Hayes ESP serial ports.  Both single
 	  port cards and multiport cards are supported.  Make sure to read
Index: linux-2.6.17/drivers/mmc/Kconfig
===================================================================
--- linux-2.6.17.orig/drivers/mmc/Kconfig	2006-07-08 18:45:01.000000000 -0700
+++ linux-2.6.17/drivers/mmc/Kconfig	2006-07-08 18:45:48.000000000 -0700
@@ -73,7 +73,7 @@
 
 config MMC_WBSD
 	tristate "Winbond W83L51xD SD/MMC Card Interface support"
-	depends on MMC && ISA_DMA_API
+	depends on MMC && ISA_DMA_API && GENERIC_ISA_DMA
 	help
 	  This selects the Winbond(R) W83L51xD Secure digital and
           Multimedia card Interface.
Index: linux-2.6.17/include/asm-x86_64/dma.h
===================================================================
--- linux-2.6.17.orig/include/asm-x86_64/dma.h	2006-07-08 18:38:48.000000000 -0700
+++ linux-2.6.17/include/asm-x86_64/dma.h	2006-07-08 18:40:44.000000000 -0700
@@ -12,6 +12,7 @@
 #include <asm/io.h>		/* need byte IO */
 #include <linux/delay.h>
 
+#ifdef CONFIG_GENERIC_ISA_DMA
 
 #ifdef HAVE_REALLY_SLOW_DMA_CONTROLLER
 #define dma_outb	outb_p
@@ -293,6 +294,7 @@
 extern int request_dma(unsigned int dmanr, const char * device_id);	/* reserve a DMA channel */
 extern void free_dma(unsigned int dmanr);	/* release it again */
 
+#endif
 /* From PCI */
 
 #ifdef CONFIG_PCI