Update of /cvsroot/gc-linux/linux/drivers/misc
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv22540/drivers/misc
Modified Files:
Kconfig Makefile gcn-gqr.c
Log Message:
Merge v2.6.32.
Index: gcn-gqr.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/misc/gcn-gqr.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** gcn-gqr.c 1 Feb 2009 18:29:35 -0000 1.4
--- gcn-gqr.c 9 Dec 2009 18:44:55 -0000 1.5
***************
*** 38,42 ****
#define MTSPR_CASE(i) case (i): mtspr(SPR_GQR##i, *((u32 *)table->data))
! static int proc_dogqr(ctl_table *table, int write, struct file *file,
void __user *buffer, size_t *lenp, loff_t *ppos)
{
--- 38,42 ----
#define MTSPR_CASE(i) case (i): mtspr(SPR_GQR##i, *((u32 *)table->data))
! static int proc_dogqr(struct ctl_table *table, int write,
void __user *buffer, size_t *lenp, loff_t *ppos)
{
***************
*** 58,62 ****
}
! r = proc_dointvec(table, write, file, buffer, lenp, ppos);
if ((r == 0) && write) { /* if they are writing, update the reg */
--- 58,62 ----
}
! r = proc_dointvec(table, write, buffer, lenp, ppos);
if ((r == 0) && write) { /* if they are writing, update the reg */
***************
*** 87,91 ****
}
! static ctl_table gqr_members[] = {
DECLARE_GQR(0),
DECLARE_GQR(1),
--- 87,91 ----
}
! static struct ctl_table gqr_members[] = {
DECLARE_GQR(0),
DECLARE_GQR(1),
***************
*** 99,103 ****
};
! static ctl_table gqr_table[] = {
{
.ctl_name = CTL_UNNUMBERED,
--- 99,103 ----
};
! static struct ctl_table gqr_table[] = {
{
.ctl_name = CTL_UNNUMBERED,
Index: Kconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/misc/Kconfig,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** Kconfig 9 Dec 2009 18:40:09 -0000 1.23
--- Kconfig 9 Dec 2009 18:44:55 -0000 1.24
***************
*** 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.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** Makefile 9 Dec 2009 18:40:09 -0000 1.19
--- Makefile 9 Dec 2009 18:44:55 -0000 1.20
***************
*** 22,25 ****
--- 22,27 ----
obj-$(CONFIG_EP93XX_PWM) += ep93xx_pwm.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/
|
