Merge branch 'master' into for_paulus

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

diff --git a/arch/sparc64/Kconfig b/arch/sparc64/Kconfig
index d41f66ac7fff71dd8768271775aad6b183de987f..f75a686ba6443d7ed3853c9afcdbbc6eeaaa83a8 100644 (file)
--- a/arch/sparc64/Kconfig
+++ b/arch/sparc64/Kconfig
@@ -232,10 +232,6 @@ config LARGE_ALLOCS
 
 source "mm/Kconfig"
 
-config GENERIC_ISA_DMA
-       bool
-       default y
-
 config ISA
        bool
        help