|
From: Laurence L. <la...@us...> - 2007-06-11 05:08:52
|
Update of /cvsroot/xbox-linux/kernel-2.6/drivers/video In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv5497/drivers/video Modified Files: Kconfig Makefile Log Message: Merge 2.6.20 Index: Makefile =================================================================== RCS file: /cvsroot/xbox-linux/kernel-2.6/drivers/video/Makefile,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- Makefile 11 Jun 2007 05:07:35 -0000 1.19 +++ Makefile 11 Jun 2007 05:08:52 -0000 1.20 @@ -100,6 +100,7 @@ obj-$(CONFIG_FB_S3C2410) += s3c2410fb.o obj-$(CONFIG_FB_PNX4008_DUM) += pnx4008/ obj-$(CONFIG_FB_PNX4008_DUM_RGB) += pnx4008/ +obj-$(CONFIG_FB_IBM_GXT4500) += gxt4500.o # Platform or fallback drivers go here obj-$(CONFIG_FB_VESA) += vesafb.o Index: Kconfig =================================================================== RCS file: /cvsroot/xbox-linux/kernel-2.6/drivers/video/Kconfig,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- Kconfig 11 Jun 2007 05:07:35 -0000 1.22 +++ Kconfig 11 Jun 2007 05:08:52 -0000 1.23 @@ -541,6 +541,7 @@ select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT + select BITREVERSE help This is the frame buffer device driver for generic TGA graphic cards. Say Y if you have one of those. @@ -551,6 +552,7 @@ select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT + select VIDEO_SELECT help This is the frame buffer device driver for generic VESA 2.0 compliant graphic cards. The older VESA 1.2 cards are not supported. @@ -705,6 +707,7 @@ select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT + select BITREVERSE help This driver supports graphics boards with the nVidia chips, TNT and newer. For very old chipsets, such as the RIVA128, then use @@ -744,6 +747,7 @@ select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT + select BITREVERSE help This driver supports graphics boards with the nVidia Riva/Geforce chips. @@ -1625,6 +1629,16 @@ ---help--- Say Y here to enable support for PNX4008 RGB Framebuffer +config FB_IBM_GXT4500 + tristate "Framebuffer support for IBM GXT4500P adaptor" + depends on PPC + select FB_CFB_FILLRECT + select FB_CFB_COPYAREA + select FB_CFB_IMAGEBLIT + ---help--- + Say Y here to enable support for the IBM GXT4500P display + adaptor, found on some IBM System P (pSeries) machines. + config FB_VIRTUAL tristate "Virtual Frame Buffer support (ONLY FOR TESTING!)" depends on FB |