optional GENERIC_ISA_DMA

@@ -7,13 +7,14 @@
 obj-y	:= process.o signal.o entry.o traps.o irq.o \
 		ptrace.o time.o ioport.o ldt.o setup.o i8259.o sys_i386.o \
 		pci-dma.o i386_ksyms.o i387.o bootflag.o e820.o\
-		quirks.o i8237.o topology.o alternative.o i8253.o tsc.o
+		quirks.o topology.o alternative.o i8253.o tsc.o
 
 obj-$(CONFIG_STACKTRACE)	+= stacktrace.o
 obj-y				+= cpu/
 obj-y				+= acpi/
 obj-$(CONFIG_X86_BIOS_REBOOT)	+= reboot.o
 obj-$(CONFIG_MCA)		+= mca.o
+obj-$(CONFIG_GENERIC_ISA_DMA)	+= i8237.o
 obj-$(CONFIG_X86_MSR)		+= msr.o
 obj-$(CONFIG_X86_CPUID)		+= cpuid.o
 obj-$(CONFIG_MICROCODE)		+= microcode.o

@@ -53,10 +53,6 @@
 config SBUS
 	bool
 
-config GENERIC_ISA_DMA
-	bool
-	default y
-
 config GENERIC_IOMAP
 	bool
 	default y

@@ -1134,11 +1130,12 @@
 
 config ISA_DMA_API
 	bool
-	default y
+	default n
 
 config ISA
 	bool "ISA support"
 	depends on !(X86_VOYAGER || X86_VISWS)
+	select GENERIC_ISA_DMA
 	help
 	  Find out whether you have ISA slots on your motherboard.  ISA is the
 	  name of a bus system, i.e. the way the CPU talks to the other stuff

@@ -1146,6 +1143,21 @@
 	  (MCA) or VESA.  ISA is an older system, now being displaced by PCI;
 	  newer boards don't support it.  If you have ISA, say Y, otherwise N.
 
+config GENERIC_ISA_DMA
+	bool "ISA DMA API"
+	select ISA_DMA_API
+	default y
+	help
+	  This enables support for the ISA DMA API, which provides DMA
+	  channel management. Its automatically selected by CONFIG_ISA.
+
+	  Say N here if you do not have ISA devices on your x86 system.
+	  Doing so might disable the DMA zone (0-16MiB), which simplifies 
+	  virtual memory management.
+
+	  If unsure, say Y.
+
+
 config EISA
 	bool "EISA support"
 	depends on ISA