[Gc-linux-cvs] linux/drivers/video Kconfig, 1.41, 1.42 Makefile, 1.37, 1.38

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 454-5900

Update of /cvsroot/gc-linux/linux/drivers/video
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv21229/drivers/video

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


Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/video/Makefile,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** Makefile	9 Dec 2009 18:18:07 -0000	1.37
--- Makefile	9 Dec 2009 18:40:10 -0000	1.38
***************
*** 86,89 ****
--- 86,90 ----
  obj-$(CONFIG_FB_HP300)            += hpfb.o
  obj-$(CONFIG_FB_G364)             += g364fb.o
+ obj-$(CONFIG_FB_EP93XX)		  += ep93xx-fb.o
  obj-$(CONFIG_FB_SA1100)           += sa1100fb.o
  obj-$(CONFIG_FB_HIT)              += hitfb.o
***************
*** 127,130 ****
--- 128,132 ----
  obj-$(CONFIG_FB_CARMINE)          += carminefb.o
  obj-$(CONFIG_FB_MB862XX)	  += mb862xx/
+ obj-$(CONFIG_FB_MSM)              += msm/
  
  # Platform or fallback drivers go here
***************
*** 137,140 ****
--- 139,143 ----
  obj-$(CONFIG_FB_BFIN_T350MCQB)	  += bfin-t350mcqb-fb.o
  obj-$(CONFIG_FB_MX3)		  += mx3fb.o
+ obj-$(CONFIG_FB_DA8XX)		  += da8xx-fb.o
  
  # the test framebuffer is last

Index: Kconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/video/Kconfig,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** Kconfig	9 Dec 2009 18:18:07 -0000	1.41
--- Kconfig	9 Dec 2009 18:40:10 -0000	1.42
***************
*** 8,11 ****
--- 8,13 ----
  source "drivers/char/agp/Kconfig"
  
+ source "drivers/gpu/vga/Kconfig"
+ 
  source "drivers/gpu/drm/Kconfig"
  
***************
*** 936,940 ****
  config FB_ATMEL
  	tristate "AT91/AT32 LCD Controller support"
! 	depends on FB && (ARCH_AT91SAM9261 || ARCH_AT91SAM9263 || ARCH_AT91SAM9RL || ARCH_AT91CAP9 || AVR32)
  	select FB_CFB_FILLRECT
  	select FB_CFB_COPYAREA
--- 938,942 ----
  config FB_ATMEL
  	tristate "AT91/AT32 LCD Controller support"
! 	depends on FB && (ARCH_AT91SAM9261 || ARCH_AT91SAM9G10 || ARCH_AT91SAM9263 || ARCH_AT91SAM9RL || ARCH_AT91SAM9G45 || ARCH_AT91CAP9 || AVR32)
  	select FB_CFB_FILLRECT
  	select FB_CFB_COPYAREA
***************
*** 952,956 ****
  config FB_ATMEL_STN
  	bool "Use a STN display with AT91/AT32 LCD Controller"
! 	depends on FB_ATMEL && MACH_AT91SAM9261EK
  	default n
  	help
--- 954,958 ----
  config FB_ATMEL_STN
  	bool "Use a STN display with AT91/AT32 LCD Controller"
! 	depends on FB_ATMEL && (MACH_AT91SAM9261EK || MACH_AT91SAM9G10EK)
  	default n
  	help
***************
*** 1274,1297 ****
  	  engine).
  
- config FB_MATROX_MULTIHEAD
- 	bool "Multihead support"
- 	depends on FB_MATROX
- 	---help---
- 	  Say Y here if you have more than one (supported) Matrox device in
- 	  your computer and you want to use all of them for different monitors
- 	  ("multihead"). If you have only one device, you should say N because
- 	  the driver compiled with Y is larger and a bit slower, especially on
- 	  ia32 (ix86).
- 
- 	  If you said M to "Matrox unified accelerated driver" and N here, you
- 	  will still be able to use several Matrox devices simultaneously:
- 	  insert several instances of the module matroxfb into the kernel
- 	  with insmod, supplying the parameter "dev=N" where N is 0, 1, etc.
- 	  for the different Matrox devices. This method is slightly faster but
- 	  uses 40 KB of kernel memory per Matrox card.
- 
- 	  There is no need for enabling 'Matrox multihead support' if you have
- 	  only one Matrox card in the box.
- 
  config FB_RADEON
  	tristate "ATI Radeon display support"
--- 1276,1279 ----
***************
*** 1868,1872 ****
  config FB_SH_MOBILE_LCDC
  	tristate "SuperH Mobile LCDC framebuffer support"
! 	depends on FB && SUPERH
  	select FB_SYS_FILLRECT
  	select FB_SYS_COPYAREA
--- 1850,1854 ----
  config FB_SH_MOBILE_LCDC
  	tristate "SuperH Mobile LCDC framebuffer support"
! 	depends on FB && SUPERH && HAVE_CLK
  	select FB_SYS_FILLRECT
  	select FB_SYS_COPYAREA
***************
*** 2040,2043 ****
--- 2022,2036 ----
  	  panels <= 320 pixel horizontal resolution.
  
+ config FB_DA8XX
+ 	tristate "DA8xx/OMAP-L1xx Framebuffer support"
+ 	depends on FB && ARCH_DAVINCI_DA8XX
+ 	select FB_CFB_FILLRECT
+ 	select FB_CFB_COPYAREA
+ 	select FB_CFB_IMAGEBLIT
+ 	---help---
+ 	  This is the frame buffer device driver for the TI LCD controller
+ 	  found on DA8xx/OMAP-L1xx SoCs.
+ 	  If unsure, say N.
+ 
  config FB_VIRTUAL
  	tristate "Virtual Frame Buffer support (ONLY FOR TESTING!)"
***************
*** 2116,2126 ****
  	  Framebuffer support for Fujitsu Lime GDC on host CPU bus.
  
  config FB_PRE_INIT_FB
  	bool "Don't reinitialize, use bootloader's GDC/Display configuration"
! 	depends on FB_MB862XX_LIME
  	---help---
  	  Select this option if display contents should be inherited as set by
  	  the bootloader.
  
  config FB_MX3
  	tristate "MX3 Framebuffer support"
--- 2109,2138 ----
  	  Framebuffer support for Fujitsu Lime GDC on host CPU bus.
  
+ config FB_EP93XX
+ 	tristate "EP93XX frame buffer support"
+ 	depends on FB && ARCH_EP93XX
+ 	select FB_CFB_FILLRECT
+ 	select FB_CFB_COPYAREA
+ 	select FB_CFB_IMAGEBLIT
+ 	---help---
+ 	  Framebuffer driver for the Cirrus Logic EP93XX series of processors.
+ 	  This driver is also available as a module. The module will be called
+ 	  ep93xx-fb.
+ 
  config FB_PRE_INIT_FB
  	bool "Don't reinitialize, use bootloader's GDC/Display configuration"
! 	depends on FB && FB_MB862XX_LIME
  	---help---
  	  Select this option if display contents should be inherited as set by
  	  the bootloader.
  
+ config FB_MSM
+ 	tristate
+ 	depends on FB && ARCH_MSM
+ 	select FB_CFB_FILLRECT
+ 	select FB_CFB_COPYAREA
+ 	select FB_CFB_IMAGEBLIT
+ 	default y
+ 
  config FB_MX3
  	tristate "MX3 Framebuffer support"