Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6

[~andy/linux] / arch / sparc / Kconfig

diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index d0dec1ea2eed93345091981a64c6028f9ae474ff..bd992c0048f0aa1d8801b6dde2b3380982268ef9 100644 (file)
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@ -13,6 +13,10 @@ config HIGHMEM
        bool
        default y
 
+config ZONE_DMA
+       bool
+       default y
+
 config GENERIC_ISA_DMA
        bool
        default y