From: Christoph Lameter <clameter@sgi.com>

Remove ZONE_DMA remains from parisc so that kernels are build without
ZONE_DMA.

Signed-off-by: Christoph Lameter <clameter@sgi.com>
Cc: Kyle McMartin <kyle@mcmartin.ca>
Cc: Matthew Wilcox <willy@debian.org>
Cc: James Bottomley <James.Bottomley@steeleye.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 arch/parisc/Kconfig   |    3 ---
 arch/parisc/mm/init.c |    4 +---
 2 files changed, 1 insertion(+), 6 deletions(-)

diff -puN arch/parisc/Kconfig~remove-zone_dma-remains-from-parisc arch/parisc/Kconfig
--- a/arch/parisc/Kconfig~remove-zone_dma-remains-from-parisc
+++ a/arch/parisc/Kconfig
@@ -50,9 +50,6 @@ config TIME_LOW_RES
 	depends on SMP
 	default y
 
-config GENERIC_ISA_DMA
-	bool
-
 config GENERIC_HARDIRQS
 	def_bool y
 
diff -puN arch/parisc/mm/init.c~remove-zone_dma-remains-from-parisc arch/parisc/mm/init.c
--- a/arch/parisc/mm/init.c~remove-zone_dma-remains-from-parisc
+++ a/arch/parisc/mm/init.c
@@ -808,9 +808,7 @@ void __init paging_init(void)
 	for (i = 0; i < npmem_ranges; i++) {
 		unsigned long zones_size[MAX_NR_ZONES] = { 0, };
 
-		/* We have an IOMMU, so all memory can go into a single
-		   ZONE_DMA zone. */
-		zones_size[ZONE_DMA] = pmem_ranges[i].pages;
+		zones_size[ZONE_NORMAL] = pmem_ranges[i].pages;
 
 #ifdef CONFIG_DISCONTIGMEM
 		/* Need to initialize the pfnnid_map before we can initialize
_