diff options
author | David S. Miller <davem@davemloft.net> | 2015-02-18 02:48:51 (GMT) |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-02-18 02:48:51 (GMT) |
commit | fece13ca005a5f559147e9424321f4b5e01272b4 (patch) | |
tree | 54e762e70afb664d14152e6bcf89a48be3fb9c13 /arch/cris/Kconfig | |
parent | 855e7e7174bade3f2b63077a81eea5aab525dbf6 (diff) | |
parent | f5af19d10d151c5a2afae3306578f485c244db25 (diff) | |
download | linux-fece13ca005a5f559147e9424321f4b5e01272b4.tar.xz |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'arch/cris/Kconfig')
-rw-r--r-- | arch/cris/Kconfig | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/cris/Kconfig b/arch/cris/Kconfig index 52731e2..4a03911 100644 --- 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" |