Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[linux-2.6] / arch / arm26 / Kconfig

diff --git a/arch/arm26/Kconfig b/arch/arm26/Kconfig
index 74eba8b5a8ca41c5576b30c691b56344f0a416ce..20688bc13e9bc57ea89785c3e75deb81216f7d58 100644 (file)
--- a/arch/arm26/Kconfig
+++ b/arch/arm26/Kconfig
@@ -57,8 +57,9 @@ config GENERIC_CALIBRATE_DELAY
        bool
        default y
 
-config GENERIC_BUST_SPINLOCK
+config ZONE_DMA
        bool
+       default y
 
 config GENERIC_ISA_DMA
        bool