From: Albert H. <he...@us...> - 2008-09-14 19:20:54
|
Update of /cvsroot/gc-linux/linux/arch/powerpc/platforms In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv4241/arch/powerpc/platforms Modified Files: Kconfig.cputype Log Message: Merge 2.6.26. Index: Kconfig.cputype =================================================================== RCS file: /cvsroot/gc-linux/linux/arch/powerpc/platforms/Kconfig.cputype,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- Kconfig.cputype 13 Sep 2008 19:42:53 -0000 1.3 +++ Kconfig.cputype 14 Sep 2008 19:20:27 -0000 1.4 @@ -41,11 +41,13 @@ bool "AMCC 40x" select PPC_DCR_NATIVE select PPC_UDBG_16550 + select 4xx_SOC config 44x bool "AMCC 44x" select PPC_DCR_NATIVE select PPC_UDBG_16550 + select 4xx_SOC config E200 bool "Freescale e200" @@ -218,8 +220,8 @@ If you don't know what to do here, say N. config NR_CPUS - int "Maximum number of CPUs (2-128)" - range 2 128 + int "Maximum number of CPUs (2-1024)" + range 2 1024 depends on SMP default "32" if PPC64 default "4" |