[Gc-linux-cvs] linux/arch/powerpc Kconfig, 1.15, 1.16 Kconfig.debug, 1.13, 1.14

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

Update of /cvsroot/gc-linux/linux/arch/powerpc
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv22540/arch/powerpc

Modified Files:
	Kconfig Kconfig.debug 
Log Message:
Merge v2.6.32.

Index: Kconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/arch/powerpc/Kconfig,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** Kconfig	9 Dec 2009 18:40:08 -0000	1.15
--- Kconfig	9 Dec 2009 18:44:54 -0000	1.16
***************
*** 680,684 ****
  	bool "PCI support" if PPC_PCI_CHOICE
  	default y if !40x && !CPM2 && !8xx && !PPC_83xx \
! 		&& !PPC_85xx && !PPC_86xx
  	default PCI_PERMEDIA if !4xx && !CPM2 && !8xx
  	default PCI_QSPAN if !4xx && !CPM2 && 8xx
--- 680,684 ----
  	bool "PCI support" if PPC_PCI_CHOICE
  	default y if !40x && !CPM2 && !8xx && !PPC_83xx \
! 		&& !PPC_85xx && !PPC_86xx && !GAMECUBE_COMMON
  	default PCI_PERMEDIA if !4xx && !CPM2 && !8xx
  	default PCI_QSPAN if !4xx && !CPM2 && 8xx

Index: Kconfig.debug
===================================================================
RCS file: /cvsroot/gc-linux/linux/arch/powerpc/Kconfig.debug,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** Kconfig.debug	9 Dec 2009 18:18:06 -0000	1.13
--- Kconfig.debug	9 Dec 2009 18:44:54 -0000	1.14
***************
*** 255,258 ****
--- 255,266 ----
  	  has run, and set up the CPM in a particular way.
  
+ config PPC_EARLY_DEBUG_USBGECKO
+ 	bool "Early debugging through the USB Gecko adapter"
+ 	depends on GAMECUBE_COMMON
+ 	select USBGECKO_UDBG
+ 	help
+ 	  Select this to enable early debugging for Nintendo GameCube/Wii
+ 	  consoles via an external USB Gecko adapter.
+ 
  endchoice