diff --git a/[refs] b/[refs] index dc2424694ab5..b0f59455890a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8434e73d9ec2aeaa86389e362b960ffba5edd9c9 +refs/heads/master: fa3f1f42b4efac84c459383218c20ab39e4df566 diff --git a/trunk/arch/x86/Kconfig b/trunk/arch/x86/Kconfig index 629923126653..e50e38e76d9f 100644 --- a/trunk/arch/x86/Kconfig +++ b/trunk/arch/x86/Kconfig @@ -885,7 +885,7 @@ config NUMA_EMU number of nodes. This is only useful for debugging. config NODES_SHIFT - int + int "Max num nodes shift(1-15)" range 1 15 if X86_64 default "6" if X86_64 default "4" if X86_NUMAQ