[Gc-linux-cvs] linux/drivers/video Kconfig, 1.35, 1.36 Makefile, 1.31, 1.32

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

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

Modified Files:
	Kconfig Makefile 
Log Message:
Forward to v.2.6.30.

Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/video/Makefile,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** Makefile	25 Oct 2009 18:33:47 -0000	1.31
--- Makefile	25 Oct 2009 18:45:36 -0000	1.32
***************
*** 57,61 ****
  obj-$(CONFIG_FB_FM2)              += fm2fb.o
  obj-$(CONFIG_FB_VT8623)           += vt8623fb.o
- obj-$(CONFIG_FB_CYBLA)            += cyblafb.o
  obj-$(CONFIG_FB_TRIDENT)          += tridentfb.o
  obj-$(CONFIG_FB_LE80578)          += vermilion/
--- 57,60 ----
***************
*** 77,80 ****
--- 76,80 ----
  obj-$(CONFIG_FB_MAC)              += macfb.o
  obj-$(CONFIG_FB_HECUBA)           += hecubafb.o
+ obj-$(CONFIG_FB_N411)             += n411.o
  obj-$(CONFIG_FB_HGA)              += hgafb.o
  obj-$(CONFIG_FB_XVR500)           += sunxvr500.o
***************
*** 107,113 ****
--- 107,115 ----
  obj-$(CONFIG_FB_MAXINE)		  += maxinefb.o
  obj-$(CONFIG_FB_METRONOME)        += metronomefb.o
+ obj-$(CONFIG_FB_BROADSHEET)       += broadsheetfb.o
  obj-$(CONFIG_FB_S1D13XXX)	  += s1d13xxxfb.o
  obj-$(CONFIG_FB_SH7760)		  += sh7760fb.o
  obj-$(CONFIG_FB_IMX)              += imxfb.o
+ obj-$(CONFIG_FB_S3C)		  += s3c-fb.o
  obj-$(CONFIG_FB_S3C2410)	  += s3c2410fb.o
  obj-$(CONFIG_FB_FSL_DIU)	  += fsl-diu-fb.o
***************
*** 133,137 ****
  obj-$(CONFIG_FB_BF54X_LQ043)	  += bf54x-lq043fb.o
  obj-$(CONFIG_FB_BFIN_T350MCQB)	  += bfin-t350mcqb-fb.o
! obj-$(CONFIG_FB_MX3)              += mx3fb.o

  # the test framebuffer is last
--- 135,139 ----
  obj-$(CONFIG_FB_BF54X_LQ043)	  += bf54x-lq043fb.o
  obj-$(CONFIG_FB_BFIN_T350MCQB)	  += bfin-t350mcqb-fb.o
! obj-$(CONFIG_FB_MX3)		  += mx3fb.o

  # the test framebuffer is last

Index: Kconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/video/Kconfig,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** Kconfig	25 Oct 2009 18:33:47 -0000	1.35
--- Kconfig	25 Oct 2009 18:45:36 -0000	1.36
***************
*** 398,402 ****
  config FB_IMX
  	tristate "Motorola i.MX LCD support"
! 	depends on FB && ARM && ARCH_IMX
  	select FB_CFB_FILLRECT
  	select FB_CFB_COPYAREA
--- 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
***************
*** 1129,1139 ****
            Say Y if you have and plan to use such a board.

- 	  If you say Y here and want DDC/I2C support you must first say Y to
- 	  "I2C support" and "I2C bit-banging support" in the character devices
- 	  section.
- 
- 	  If you say M here then "I2C support" and "I2C bit-banging support"
- 	  can be build either as modules or built-in.
- 
  	  To compile this driver as a module, choose M here: the
  	  module will be called intelfb.
--- 1129,1132 ----
***************
*** 1208,1216 ****
  	  different from 8.

! 	  If you need support for G400 secondary head, you must first say Y to
! 	  "I2C support" in the character devices section, and then to
! 	  "Matrox I2C support" and "G400 second head support" here in the
! 	  framebuffer section. G450/G550 secondary head and digital output
! 	  are supported without additional modules.

  	  The driver starts in monitor mode. You must use the matroxset tool 
--- 1201,1208 ----
  	  different from 8.

! 	  If you need support for G400 secondary head, you must say Y to
! 	  "Matrox I2C support" and "G400 second head support" right below.
! 	  G450/G550 secondary head and digital output are supported without
! 	  additional modules.

  	  The driver starts in monitor mode. You must use the matroxset tool 
***************
*** 1311,1321 ****
  	  don't need to choose this to run the Radeon in plain VGA mode.

- 	  If you say Y here and want DDC/I2C support you must first say Y to
- 	  "I2C support" and "I2C bit-banging support" in the character devices
- 	  section.
- 
- 	  If you say M here then "I2C support" and "I2C bit-banging support" 
- 	  can be build either as modules or built-in.
- 
  	  There is a product page at
  	  http://apps.ati.com/ATIcompare/
--- 1303,1306 ----
***************
*** 1551,1554 ****
--- 1536,1540 ----
  	select FB_CFB_FILLRECT
  	select FB_CFB_COPYAREA
+ 	select FB_MODE_HELPERS
  	help
  	  This driver supports graphics boards with the 3Dfx Banshee,
***************
*** 1566,1569 ****
--- 1552,1563 ----
  	device driver with acceleration functions.

+ config FB_3DFX_I2C
+ 	bool "Enable DDC/I2C support"
+ 	depends on FB_3DFX && EXPERIMENTAL
+ 	select FB_DDC
+ 	default y
+ 	help
+ 	  Say Y here if you want DDC/I2C support for your 3dfx Voodoo3.
+ 
  config FB_VOODOO1
  	tristate "3Dfx Voodoo Graphics (sst1) support"
***************
*** 1598,1627 ****
  	  VIA VT8623 [Apollo CLE266] chipset.

- config FB_CYBLA
- 	tristate "Cyberblade/i1 support"
- 	depends on FB && PCI && X86_32 && !64BIT
- 	select FB_CFB_IMAGEBLIT
- 	---help---
- 	  This driver is supposed to support the Trident Cyberblade/i1
- 	  graphics core integrated in the VIA VT8601A North Bridge,
- 	  also known as VIA Apollo PLE133.
- 
- 	  Status:
- 	   - Developed, tested and working on EPIA 5000 and EPIA 800.
- 	   - Does work reliable on all systems with CRT/LCD connected to
- 	     normal VGA ports.
- 	   - Should work on systems that do use the internal LCD port, but
- 	     this is absolutely not tested.
- 
- 	  Character imageblit, copyarea and rectangle fill are hw accelerated,
- 	  ypan scrolling is used by default.
- 
- 	  Please do read <file:Documentation/fb/cyblafb/*>.
- 
- 	  To compile this driver as a module, choose M here: the
- 	  module will be called cyblafb.
- 
  config FB_TRIDENT
! 	tristate "Trident support"
  	depends on FB && PCI
  	select FB_CFB_FILLRECT
--- 1592,1597 ----
  	  VIA VT8623 [Apollo CLE266] chipset.

  config FB_TRIDENT
! 	tristate "Trident/CyberXXX/CyberBlade support"
  	depends on FB && PCI
  	select FB_CFB_FILLRECT
***************
*** 1634,1639 ****
  	  There are also integrated versions of these chips called CyberXXXX,
  	  CyberImage or CyberBlade. These chips are mostly found in laptops
! 	  but also on some motherboards. For more information, read
! 	  <file:Documentation/fb/tridentfb.txt>

  	  Say Y if you have such a graphics board.
--- 1604,1609 ----
  	  There are also integrated versions of these chips called CyberXXXX,
  	  CyberImage or CyberBlade. These chips are mostly found in laptops
! 	  but also on some motherboards including early VIA EPIA motherboards.
! 	  For more information, read <file:Documentation/fb/tridentfb.txt>

  	  Say Y if you have such a graphics board.
***************
*** 1642,1652 ****
  	  module will be called tridentfb.

- config FB_TRIDENT_ACCEL
- 	bool "Trident Acceleration functions (EXPERIMENTAL)"
- 	depends on FB_TRIDENT && EXPERIMENTAL
- 	---help---
- 	This will compile the Trident frame buffer device with
- 	acceleration functions.
- 
  config FB_ARK
  	tristate "ARK 2000PV support"
--- 1612,1615 ----
***************
*** 1921,1924 ****
--- 1884,1911 ----
  	default y

+ config FB_S3C
+ 	tristate "Samsung S3C framebuffer support"
+ 	depends on FB && ARCH_S3C64XX
+ 	select FB_CFB_FILLRECT
+ 	select FB_CFB_COPYAREA
+ 	select FB_CFB_IMAGEBLIT
+ 	---help---
+ 	  Frame buffer driver for the built-in FB controller in the Samsung
+ 	  SoC line from the S3C2443 onwards, including the S3C2416, S3C2450,
+ 	  and the S3C64XX series such as the S3C6400 and S3C6410.
+ 
+ 	  These chips all have the same basic framebuffer design with the
+ 	  actual capabilities depending on the chip. For instance the S3C6400
+ 	  and S3C6410 support 4 hardware windows whereas the S3C24XX series
+ 	  currently only have two.
+ 
+ 	  Currently the support is only for the S3C6400 and S3C6410 SoCs.
+ 
+ config FB_S3C_DEBUG_REGWRITE
+        bool "Debug register writes"
+        depends on FB_S3C
+        ---help---
+          Show all register writes via printk(KERN_DEBUG)
+ 
  config FB_S3C2410
  	tristate "S3C2410 LCD framebuffer support"
***************
*** 2121,2134 ****

  config FB_MX3
!        tristate "MX3 Framebuffer support"
!        depends on FB && MX3_IPU
!        select FB_CFB_FILLRECT
!        select FB_CFB_COPYAREA
!        select FB_CFB_IMAGEBLIT
!        default y
!        help
!          This is a framebuffer device for the i.MX31 LCD Controller. So
!          far only synchronous displays are supported. If you plan to use
!          an LCD display with your i.MX31 system, say Y here.

  source "drivers/video/omap/Kconfig"
--- 2108,2135 ----

  config FB_MX3
! 	tristate "MX3 Framebuffer support"
! 	depends on FB && MX3_IPU
! 	select FB_CFB_FILLRECT
! 	select FB_CFB_COPYAREA
! 	select FB_CFB_IMAGEBLIT
! 	default y
! 	help
! 	  This is a framebuffer device for the i.MX31 LCD Controller. So
! 	  far only synchronous displays are supported. If you plan to use
! 	  an LCD display with your i.MX31 system, say Y here.
! 
! config FB_BROADSHEET
! 	tristate "E-Ink Broadsheet/Epson S1D13521 controller support"
! 	depends on FB
! 	select FB_SYS_FILLRECT
! 	select FB_SYS_COPYAREA
! 	select FB_SYS_IMAGEBLIT
! 	select FB_SYS_FOPS
! 	select FB_DEFERRED_IO
! 	help
! 	  This driver implements support for the E-Ink Broadsheet
! 	  controller. The release name for this device was Epson S1D13521
! 	  and could also have been called by other names when coupled with
! 	  a bridge adapter.

  source "drivers/video/omap/Kconfig"