Merge tag 'v4.0-rc2' into timers/core, to refresh the tree before pulling more changes

[karo-tx-linux.git] / arch / cris / Kconfig

diff --git a/arch/cris/Kconfig b/arch/cris/Kconfig
index 52731e221851137ce57ad7aa7b176cbe07e116a6..4a03911053ab8df634cfa200158fb54aa4ac3aca 100644 (file)
--- a/arch/cris/Kconfig
+++ b/arch/cris/Kconfig
@@ -57,6 +57,10 @@ config HZ
        int
        default 100
 
+config NR_CPUS
+       int
+       default "1"
+
 source "init/Kconfig"
 
 source "kernel/Kconfig.freezer"