[Gc-linux-cvs] linux/arch/powerpc Kconfig, 1.9, 1.10 Kconfig.debug, 1.8, 1.9

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

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

Modified Files:
	Kconfig Kconfig.debug 
Log Message:
Merge gc-linux-v2.6.30.


Index: Kconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/arch/powerpc/Kconfig,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Kconfig	25 Oct 2009 18:45:35 -0000	1.9
--- Kconfig	25 Oct 2009 18:50:26 -0000	1.10
***************
*** 659,663 ****
  	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
--- 659,663 ----
  	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.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Kconfig.debug	25 Oct 2009 18:45:35 -0000	1.8
--- Kconfig.debug	25 Oct 2009 18:50:26 -0000	1.9
***************
*** 225,228 ****
--- 225,236 ----
  	  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