Merge master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6

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

diff --git a/arch/v850/Kconfig b/arch/v850/Kconfig
index f0d4d72e560fe8e1b68700e6c87929da3239bae6..5f54c1236c18daa5809aaf461d25119bd2fcfdc8 100644 (file)
--- a/arch/v850/Kconfig
+++ b/arch/v850/Kconfig
@@ -10,6 +10,9 @@ mainmenu "uClinux/v850 (w/o MMU) Kernel Configuration"
 config MMU
                bool
        default n
+config ZONE_DMA
+       bool
+       default y
 config RWSEM_GENERIC_SPINLOCK
        bool
        default y
@@ -34,6 +37,10 @@ config GENERIC_IRQ_PROBE
        bool
        default y
 
+config GENERIC_TIME
+       bool
+       default y
+
 config TIME_LOW_RES
        bool
        default y
@@ -214,7 +221,7 @@ menu "Processor type and features"
    # Some platforms pre-zero memory, in which case the kernel doesn't need to
    config ZERO_BSS
          bool
-         depends !V850E2_SIM85E2C
+         depends on !V850E2_SIM85E2C
          default y
 
    # The crappy-ass zone allocator requires that the start of allocatable