Update of /cvsroot/gc-linux/linux/drivers/video
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv751/drivers/video
Modified Files:
Kconfig Makefile
Log Message:
Merge gc-linux-v2.6.31.
Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/video/Makefile,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** Makefile 25 Oct 2009 18:56:56 -0000 1.35
--- Makefile 25 Oct 2009 18:59:28 -0000 1.36
***************
*** 127,130 ****
--- 127,131 ----
obj-$(CONFIG_FB_CARMINE) += carminefb.o
obj-$(CONFIG_FB_MB862XX) += mb862xx/
+ obj-$(CONFIG_FB_GAMECUBE) += gcnfb.o
# Platform or fallback drivers go here
Index: Kconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/video/Kconfig,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** Kconfig 25 Oct 2009 18:56:56 -0000 1.39
--- Kconfig 25 Oct 2009 18:59:28 -0000 1.40
***************
*** 1669,1672 ****
--- 1669,1691 ----
endchoice
+ config FB_GAMECUBE
+ bool "Nintendo GameCube/Wii frame buffer"
+ depends on FB && GAMECUBE_COMMON
+ select FB_CFB_FILLRECT
+ select FB_CFB_COPYAREA
+ select FB_CFB_IMAGEBLIT
+ help
+ This is the frame buffer device driver for the Nintendo GameCube.
+
+ config WII_AVE_RVL
+ bool "Nintendo Wii audio/video encoder support"
+ depends on FB_GAMECUBE && WII
+ select I2C_GPIO
+ select I2C
+ default y
+ help
+ Say Y here to support the audio/video encoder found in the
+ Nintendo Wii video game console.
+
config FB_AU1100
bool "Au1100 LCD Driver"
|
