Merge branch 'drm-patches' of master.kernel.org:/pub/scm/linux/kernel/git/airlied...

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

diff --git a/arch/v850/Kconfig b/arch/v850/Kconfig
index dbfab8fc9b49c2c4c6e620558401f57af2bedf50..5f54c1236c18daa5809aaf461d25119bd2fcfdc8 100644 (file)
--- a/arch/v850/Kconfig
+++ b/arch/v850/Kconfig
@@ -37,6 +37,10 @@ config GENERIC_IRQ_PROBE
        bool
        default y
 
+config GENERIC_TIME
+       bool
+       default y
+
 config TIME_LOW_RES
        bool
        default y
@@ -217,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