x86: Set CONFIG_NR_CPUS even on UP

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
---
 arch/x86/Kconfig |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff -r ea57465a45af arch/x86/Kconfig
--- a/arch/x86/Kconfig	Tue Nov 18 20:53:54 2008 +1030
+++ b/arch/x86/Kconfig	Tue Nov 18 20:58:20 2008 +1030
@@ -587,12 +587,12 @@
 	  If unsure, say N.
 
 config NR_CPUS
-	depends on SMP
 	int "Maximum number of CPUs" if SMP && !MAXSMP
 	range 2 512 if SMP && !MAXSMP
+	default "1" if !SMP
 	default "4096" if MAXSMP
-	default "32" if X86_NUMAQ || X86_SUMMIT || X86_BIGSMP || X86_ES7000
-	default "8"
+	default "32" if SMP && (X86_NUMAQ || X86_SUMMIT || X86_BIGSMP || X86_ES7000)
+	default "8" if SMP
 	help
 	  This allows you to specify the maximum number of CPUs which this
 	  kernel will support.  The maximum supported value is 512 and the