Merge master.kernel.org:/pub/scm/linux/kernel/git/kyle/parisc-2.6

[linux-drm-fsl-dcu.git] / arch / parisc / Kconfig

diff --git a/arch/parisc/Kconfig b/arch/parisc/Kconfig
index e18eeecae850c2a2a565dc2a3b46a293b8dc5924..3d73545e8c484d158b96788be65a9a7fcab60f48 100644 (file)
--- a/arch/parisc/Kconfig
+++ b/arch/parisc/Kconfig
@@ -59,9 +59,6 @@ config TIME_LOW_RES
        depends on SMP
        default y
 
-config GENERIC_ISA_DMA
-       bool
-
 config GENERIC_HARDIRQS
        def_bool y