Update of /cvsroot/gc-linux/linux/drivers/video
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv22540/drivers/video
Modified Files:
Kconfig Makefile
Log Message:
Merge v2.6.32.
Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/video/Makefile,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** Makefile 9 Dec 2009 18:40:10 -0000 1.38
--- Makefile 9 Dec 2009 18:44:55 -0000 1.39
***************
*** 129,132 ****
--- 129,133 ----
obj-$(CONFIG_FB_MB862XX) += mb862xx/
obj-$(CONFIG_FB_MSM) += msm/
+ 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.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** Kconfig 9 Dec 2009 18:40:10 -0000 1.42
--- Kconfig 9 Dec 2009 18:44:55 -0000 1.43
***************
*** 1651,1654 ****
--- 1651,1673 ----
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"
|
