2 files changed, 1 insertions, 6 deletions

diff --git a/arch/parisc/Kconfig b/arch/parisc/Kconfig
index 0f9ff618c6d7..28da4e71c443 100644
--- a/arch/parisc/Kconfig
+++ b/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 --git a/arch/parisc/mm/init.c b/arch/parisc/mm/init.c
index 0667f2b4f977..0c118e584e73 100644
--- a/arch/parisc/mm/init.c
+++ b/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