[Gc-linux-cvs] linux/drivers/misc Kconfig, 1.17, 1.18 Makefile, 1.13, 1.14

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

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

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


Index: Kconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/misc/Kconfig,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** Kconfig	25 Oct 2009 18:45:35 -0000	1.17
--- Kconfig	25 Oct 2009 18:50:27 -0000	1.18
***************
*** 56,59 ****
--- 56,81 ----
  	  interval timing.
  
+ config GAMECUBE_GQR
+ 	tristate "Nintendo GameCube/Wii Graphic Quantization Registers (GQR)"
+ 	depends on GAMECUBE_COMMON
+ 	help
+           This option enables device driver support for the Gekko/Broadway
+ 	  processors' Graphic Quantization Registers.
+ 	  These registers are used with the psql and psqst instructions.
+ 	  The registers will appear in /proc/sys/gqr.
+ 
+ config GAMECUBE_MI
+ 	tristate "Nintendo GameCube Memory Interface (MI)"
+ 	depends on GAMECUBE
+ 	help
+ 	  If you say yes to this option, support will be included for the
+ 	  Memory Interface (MI) of the Nintendo GameCube.
+ 
+ 	  The MI allows one to setup up to four protected memory regions,
+ 	  catching invalid accesses to them. The MI catches out of bounds
+ 	  memory accesses too.
+ 
+ 	  If in doubt, say N here.
+ 
  config IBM_ASM
  	tristate "Device driver for IBM RSA service processor"

Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/misc/Makefile,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** Makefile	25 Oct 2009 18:45:35 -0000	1.13
--- Makefile	25 Oct 2009 18:50:27 -0000	1.14
***************
*** 21,23 ****
--- 21,25 ----
  obj-$(CONFIG_ISL29003)		+= isl29003.o
  obj-$(CONFIG_C2PORT)		+= c2port/
+ obj-$(CONFIG_GAMECUBE_GQR)	+= gcn-gqr.o
+ obj-$(CONFIG_GAMECUBE_MI)	+= gcn-mi.o
  obj-y				+= eeprom/