Update of /cvsroot/gc-linux/linux/drivers/misc
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv751/drivers/misc
Modified Files:
Kconfig Makefile gcn-mi.c
Log Message:
Merge gc-linux-v2.6.31.
Index: Kconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/misc/Kconfig,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** Kconfig 25 Oct 2009 18:56:56 -0000 1.20
--- Kconfig 25 Oct 2009 18:59:28 -0000 1.21
***************
*** 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.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** Makefile 25 Oct 2009 18:56:56 -0000 1.16
--- Makefile 25 Oct 2009 18:59:28 -0000 1.17
***************
*** 21,24 ****
--- 21,26 ----
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/
obj-y += cb710/
Index: gcn-mi.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/misc/gcn-mi.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** gcn-mi.c 1 Feb 2009 18:29:35 -0000 1.9
--- gcn-mi.c 25 Oct 2009 18:59:28 -0000 1.10
***************
*** 208,215 ****
#ifdef CONFIG_PROC_FS
struct platform_device *pdev = to_platform_device(device);
! priv->proc_file = create_proc_read_entry(pdev->dev.bus_id, 0444, NULL,
mi_proc_read, priv);
! priv->proc_file->owner = THIS_MODULE;
#endif /* CONFIG_PROC_FS */
--- 208,217 ----
#ifdef CONFIG_PROC_FS
+ {
struct platform_device *pdev = to_platform_device(device);
! priv->proc_file = create_proc_read_entry(dev_name(&pdev->dev),
! 0444, NULL,
mi_proc_read, priv);
! }
#endif /* CONFIG_PROC_FS */
***************
*** 240,244 ****
#ifdef CONFIG_PROC_FS
struct platform_device *pdev = to_platform_device(priv->device);
! remove_proc_entry(pdev->dev.bus_id, NULL);
#endif /* CONFIG_PROC_FS */
--- 242,246 ----
#ifdef CONFIG_PROC_FS
struct platform_device *pdev = to_platform_device(priv->device);
! remove_proc_entry(dev_name(&pdev->dev), NULL);
#endif /* CONFIG_PROC_FS */
|
