[Gc-linux-cvs] linux/arch/powerpc/platforms Kconfig.cputype, 1.6, 1.7

[Albert H. <he...@us...>]

Update of /cvsroot/gc-linux/linux/arch/powerpc/platforms
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv6933/arch/powerpc/platforms

Modified Files:
	Kconfig.cputype 
Log Message:
Merge v2.6.29-rc6.

NOTE: Some of the Kconfig options and Makefile entries for the drivers
marked as "broken" will disappear with this commit.



Index: Kconfig.cputype
===================================================================
RCS file: /cvsroot/gc-linux/linux/arch/powerpc/platforms/Kconfig.cputype,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Kconfig.cputype	1 Feb 2009 18:29:35 -0000	1.6
--- Kconfig.cputype	2 Mar 2009 19:26:37 -0000	1.7
***************
*** 196,200 ****
  config PPC_STD_MMU
  	bool
! 	depends on 6xx || POWER3 || POWER4 || PPC64
  	default y
  
--- 196,200 ----
  config PPC_STD_MMU
  	bool
! 	depends on 6xx || PPC64
  	default y
  
***************
*** 203,209 ****
  	depends on PPC_STD_MMU && PPC32
  
  config PPC_MM_SLICES
  	bool
! 	default y if HUGETLB_PAGE || PPC_64K_PAGES
  	default n
  
--- 203,217 ----
  	depends on PPC_STD_MMU && PPC32
  
+ config PPC_STD_MMU_64
+ 	def_bool y
+ 	depends on PPC_STD_MMU && PPC64
+ 
+ config PPC_MMU_NOHASH
+ 	def_bool y
+ 	depends on !PPC_STD_MMU
+ 
  config PPC_MM_SLICES
  	bool
! 	default y if HUGETLB_PAGE || (PPC_STD_MMU_64 && PPC_64K_PAGES)
  	default n
  
***************
*** 224,228 ****
  
  config SMP
! 	depends on PPC_STD_MMU
  	bool "Symmetric multi-processing support"
  	---help---
--- 232,236 ----
  
  config SMP
! 	depends on PPC_STD_MMU || FSL_BOOKE
  	bool "Symmetric multi-processing support"
  	---help---