From: Paul Mackerras <paulus@samba.org>
Date: Wed, 7 Feb 2007 03:05:13 +0000 (+1100)
Subject: Merge branch 'linux-2.6'
X-Git-Tag: v2.6.21-rc1~92^2~23^2~11^2~3
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8423200553113cc031caa9b147f6150a8e26545c;p=linux-2.6

Merge branch 'linux-2.6'
---

8423200553113cc031caa9b147f6150a8e26545c
diff --cc arch/powerpc/Kconfig
index 5f80f0b828,d6abe495c6..aeb53096ac
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@@ -491,7 -484,7 +491,8 @@@ config PPC_MAPL
  	select PPC_970_NAP
  	select PPC_NATIVE
  	select PPC_RTAS
 +	select MMIO_NVRAM
+ 	select ATA_NONSTANDARD if ATA
  	default n
  	help
            This option enables support for the Maple 970FX Evaluation Board.
@@@ -539,17 -532,10 +540,20 @@@ config PPC_PS
  	help
  	  This option enables support for the Sony PS3 game console
  	  and other platforms using the PS3 hypervisor.
+ 	  Support for this platform is not yet complete, so
+ 	  enabling this will not result in a bootable kernel on a
+ 	  PS3 system.
  
 +config PPC_CELLEB
 +	bool "Toshiba's Cell Reference Set 'Celleb' Architecture"
 +	depends on PPC_MULTIPLATFORM && PPC64
 +	select PPC_CELL
 +	select PPC_OF_PLATFORM_PCI
 +	select HAS_TXX9_SERIAL
 +	select PPC_UDBG_BEAT
 +	select USB_OHCI_BIG_ENDIAN_MMIO
 +	select USB_EHCI_BIG_ENDIAN_MMIO
 +
  config PPC_NATIVE
  	bool
  	depends on PPC_MULTIPLATFORM