[Gc-linux-cvs] linux/drivers/video Kconfig, 1.38, 1.39 Makefile, 1.34, 1.35

[Albert H. <he...@us...>]

Update of /cvsroot/gc-linux/linux/drivers/video
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv32669/drivers/video

Modified Files:
	Kconfig Makefile 
Log Message:
Forward to v2.6.31.


Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/video/Makefile,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** Makefile	25 Oct 2009 18:53:45 -0000	1.34
--- Makefile	25 Oct 2009 18:56:56 -0000	1.35
***************
*** 98,101 ****
--- 98,102 ----
  obj-$(CONFIG_FB_ASILIANT)	  += asiliantfb.o
  obj-$(CONFIG_FB_PXA)		  += pxafb.o
+ obj-$(CONFIG_FB_PXA168)		  += pxa168fb.o
  obj-$(CONFIG_FB_W100)		  += w100fb.o
  obj-$(CONFIG_FB_TMIO)		  += tmiofb.o

Index: Kconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/video/Kconfig,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** Kconfig	25 Oct 2009 18:53:45 -0000	1.38
--- Kconfig	25 Oct 2009 18:56:56 -0000	1.39
***************
*** 398,402 ****
  config FB_IMX
  	tristate "Motorola i.MX LCD support"
! 	depends on FB && (ARCH_IMX || ARCH_MX2)
  	select FB_CFB_FILLRECT
  	select FB_CFB_COPYAREA
--- 398,402 ----
  config FB_IMX
  	tristate "Motorola i.MX LCD support"
! 	depends on FB && (ARCH_MX1 || ARCH_MX2)
  	select FB_CFB_FILLRECT
  	select FB_CFB_COPYAREA
***************
*** 617,620 ****
--- 617,622 ----
  	select FB_CFB_COPYAREA
  	select FB_CFB_IMAGEBLIT
+ 	select STI_CONSOLE
+ 	select VT
  	default y
  	---help---
***************
*** 1118,1127 ****
  config FB_INTEL
  	tristate "Intel 830M/845G/852GM/855GM/865G/915G/945G/945GM/965G/965GM support (EXPERIMENTAL)"
! 	depends on EXPERIMENTAL && FB && PCI && X86 && AGP_INTEL
  	select FB_MODE_HELPERS
  	select FB_CFB_FILLRECT
  	select FB_CFB_COPYAREA
  	select FB_CFB_IMAGEBLIT
! 	select FB_BOOT_VESA_SUPPORT
  	help
  	  This driver supports the on-board graphics built in to the Intel
--- 1120,1130 ----
  config FB_INTEL
  	tristate "Intel 830M/845G/852GM/855GM/865G/915G/945G/945GM/965G/965GM support (EXPERIMENTAL)"
! 	depends on EXPERIMENTAL && FB && PCI && X86 && AGP_INTEL && EMBEDDED
  	select FB_MODE_HELPERS
  	select FB_CFB_FILLRECT
  	select FB_CFB_COPYAREA
  	select FB_CFB_IMAGEBLIT
! 	select FB_BOOT_VESA_SUPPORT if FB_INTEL = y
! 	depends on !DRM_I915
  	help
  	  This driver supports the on-board graphics built in to the Intel
***************
*** 1129,1132 ****
--- 1132,1137 ----
            Say Y if you have and plan to use such a board.
  
+ 	  To make FB_INTELFB=Y work you need to say AGP_INTEL=y too.
+ 
  	  To compile this driver as a module, choose M here: the
  	  module will be called intelfb.
***************
*** 1461,1465 ****
  	select FB_CFB_COPYAREA
  	select FB_CFB_IMAGEBLIT
! 	select FB_BOOT_VESA_SUPPORT
  	help
  	  This is the frame buffer device driver for the SiS 300, 315, 330
--- 1466,1470 ----
  	select FB_CFB_COPYAREA
  	select FB_CFB_IMAGEBLIT
! 	select FB_BOOT_VESA_SUPPORT if FB_SIS = y
  	help
  	  This is the frame buffer device driver for the SiS 300, 315, 330
***************
*** 1760,1763 ****
--- 1765,1778 ----
  	  the Motorola 68328 CPU family.
  
+ config FB_PXA168
+ 	tristate "PXA168/910 LCD framebuffer support"
+ 	depends on FB && (CPU_PXA168 || CPU_PXA910)
+ 	select FB_CFB_FILLRECT
+ 	select FB_CFB_COPYAREA
+ 	select FB_CFB_IMAGEBLIT
+ 	---help---
+ 	  Frame buffer driver for the built-in LCD controller in the Marvell
+ 	  MMP processor.
+ 
  config FB_PXA
  	tristate "PXA LCD framebuffer support"
***************
*** 1997,2001 ****
  config FB_XILINX
  	tristate "Xilinx frame buffer support"
! 	depends on FB && XILINX_VIRTEX
  	select FB_CFB_FILLRECT
  	select FB_CFB_COPYAREA
--- 2012,2016 ----
  config FB_XILINX
  	tristate "Xilinx frame buffer support"
! 	depends on FB && (XILINX_VIRTEX || MICROBLAZE)
  	select FB_CFB_FILLRECT
  	select FB_CFB_COPYAREA
***************
*** 2095,2098 ****
--- 2110,2114 ----
  	depends on FB_MB862XX
  	depends on OF && !FB_MB862XX_PCI_GDC
+ 	depends on PPC
  	select FB_FOREIGN_ENDIAN
  	select FB_LITTLE_ENDIAN