[Gc-linux-cvs] linux/drivers/video Kconfig, 1.33, 1.34 Makefile, 1.29, 1.30

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-serv6933/drivers/video

Modified Files:
	Kconfig Makefile 
Log Message:
Merge v2.6.29-rc6.

NOTE: Some of the Kconfig options and Makefile entries for the drivers
marked as "broken" will disappear with this commit.

Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/video/Makefile,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** Makefile	1 Feb 2009 18:29:35 -0000	1.29
--- Makefile	2 Mar 2009 19:26:37 -0000	1.30
***************
*** 29,33 ****

  # Hardware specific drivers go first
! obj-$(CONFIG_FB_AMIGA)            += amifb.o c2p.o
  obj-$(CONFIG_FB_ARC)              += arcfb.o
  obj-$(CONFIG_FB_CLPS711X)         += clps711xfb.o
--- 29,33 ----

  # Hardware specific drivers go first
! obj-$(CONFIG_FB_AMIGA)            += amifb.o c2p_planar.o
  obj-$(CONFIG_FB_ARC)              += arcfb.o
  obj-$(CONFIG_FB_CLPS711X)         += clps711xfb.o
***************
*** 73,77 ****
  obj-$(CONFIG_FB_SGIVW)            += sgivwfb.o
  obj-$(CONFIG_FB_ACORN)            += acornfb.o
! obj-$(CONFIG_FB_ATARI)            += atafb.o c2p.o atafb_mfb.o \
                                       atafb_iplan2p2.o atafb_iplan2p4.o atafb_iplan2p8.o
  obj-$(CONFIG_FB_MAC)              += macfb.o
--- 73,77 ----
  obj-$(CONFIG_FB_SGIVW)            += sgivwfb.o
  obj-$(CONFIG_FB_ACORN)            += acornfb.o
! obj-$(CONFIG_FB_ATARI)            += atafb.o c2p_iplan2.o atafb_mfb.o \
                                       atafb_iplan2p2.o atafb_iplan2p4.o atafb_iplan2p8.o
  obj-$(CONFIG_FB_MAC)              += macfb.o
***************
*** 125,129 ****
  obj-$(CONFIG_FB_MB862XX)	  += mb862xx/
  obj-$(CONFIG_FB_GAMECUBE)	  += gcnfb.o
- obj-$(CONFIG_FB_GAMECUBE_GX)	  += gcngx.o

  # Platform or fallback drivers go here
--- 125,128 ----
***************
*** 135,138 ****
--- 134,138 ----
  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.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** Kconfig	2 Mar 2009 18:47:21 -0000	1.33
--- Kconfig	2 Mar 2009 19:26:37 -0000	1.34
***************
*** 42,46 ****
  	  buffer devices. Please read <file:Documentation/fb/framebuffer.txt>
  	  and the Framebuffer-HOWTO at
! 	  <http://www.tahallah.demon.co.uk/programming/prog.html> for more
  	  information.

--- 42,46 ----
  	  buffer devices. Please read <file:Documentation/fb/framebuffer.txt>
  	  and the Framebuffer-HOWTO at
! 	  <http://www.munted.org.uk/programming/Framebuffer-HOWTO-1.2.html> for more
  	  information.

***************
*** 363,367 ****
  config FB_ACORN
  	bool "Acorn VIDC support"
! 	depends on (FB = y) && ARM && (ARCH_ACORN || ARCH_CLPS7500)
  	select FB_CFB_FILLRECT
  	select FB_CFB_COPYAREA
--- 363,367 ----
  config FB_ACORN
  	bool "Acorn VIDC support"
! 	depends on (FB = y) && ARM && ARCH_ACORN
  	select FB_CFB_FILLRECT
  	select FB_CFB_COPYAREA
***************
*** 1055,1061 ****
  config FB_I810
  	tristate "Intel 810/815 support (EXPERIMENTAL)"
! 	depends on FB && EXPERIMENTAL && PCI && X86_32
! 	select AGP
! 	select AGP_INTEL
  	select FB_MODE_HELPERS
  	select FB_CFB_FILLRECT
--- 1055,1059 ----
  config FB_I810
  	tristate "Intel 810/815 support (EXPERIMENTAL)"
! 	depends on EXPERIMENTAL && FB && PCI && X86_32 && AGP_INTEL
  	select FB_MODE_HELPERS
  	select FB_CFB_FILLRECT
***************
*** 1120,1126 ****
  config FB_INTEL
  	tristate "Intel 830M/845G/852GM/855GM/865G/915G/945G/945GM/965G/965GM support (EXPERIMENTAL)"
! 	depends on FB && EXPERIMENTAL && PCI && X86
! 	select AGP
! 	select AGP_INTEL
  	select FB_MODE_HELPERS
  	select FB_CFB_FILLRECT
--- 1118,1122 ----
  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
***************
*** 1714,1723 ****
  	  This is the frame buffer device driver for the Nintendo GameCube.

- config FB_GAMECUBE_GX
- 	bool "Nintendo GameCube hardware accelerated graphics support"
- 	depends on FB_GAMECUBE && GAMECUBE && BROKEN
- 	help
- 	  Say Y here to support the 3D hardware found in the Nintendo GameCube.
- 
  config WII_AVE_RVL
  	bool "Nintendo Wii audio/video encoder support"
--- 1710,1713 ----
***************
*** 1843,1846 ****
--- 1833,1841 ----
  	  If unsure, say N.

+ config FB_PXA_OVERLAY
+ 	bool "Support PXA27x/PXA3xx Overlay(s) as framebuffer"
+ 	default n
+ 	depends on FB_PXA && (PXA27x || PXA3xx)
+ 
  config FB_PXA_SMARTPANEL
  	bool "PXA Smartpanel LCD support"
***************
*** 1915,1922 ****
  	tristate "SuperH Mobile LCDC framebuffer support"
  	depends on FB && SUPERH
! 	select FB_CFB_FILLRECT
! 	select FB_CFB_COPYAREA
! 	select FB_CFB_IMAGEBLIT
! 	default m
  	---help---
  	  Frame buffer driver for the on-chip SH-Mobile LCD controller.
--- 1910,1918 ----
  	tristate "SuperH Mobile LCDC framebuffer support"
  	depends on FB && SUPERH
! 	select FB_SYS_FILLRECT
! 	select FB_SYS_COPYAREA
! 	select FB_SYS_IMAGEBLIT
! 	select FB_SYS_FOPS
! 	select FB_DEFERRED_IO
  	---help---
  	  Frame buffer driver for the on-chip SH-Mobile LCD controller.
***************
*** 2047,2061 ****

  config FB_SH7760
!        bool "SH7760/SH7763 LCDC support"
!        depends on FB && (CPU_SUBTYPE_SH7760 || CPU_SUBTYPE_SH7763)
!        select FB_CFB_FILLRECT
!        select FB_CFB_COPYAREA
!        select FB_CFB_IMAGEBLIT
!        help
!          Support for the SH7760/SH7763 integrated (D)STN/TFT LCD Controller.
!          Supports display resolutions up to 1024x1024 pixel, grayscale and
!          color operation, with depths ranging from 1 bpp to 8 bpp monochrome
!          and 8, 15 or 16 bpp color; 90 degrees clockwise display rotation for
!          panels <= 320 pixel horizontal resolution.

  config FB_VIRTUAL
--- 2043,2059 ----

  config FB_SH7760
! 	bool "SH7760/SH7763/SH7720/SH7721 LCDC support"
! 	depends on FB && (CPU_SUBTYPE_SH7760 || CPU_SUBTYPE_SH7763 \
! 		|| CPU_SUBTYPE_SH7720 || CPU_SUBTYPE_SH7721)
! 	select FB_CFB_FILLRECT
! 	select FB_CFB_COPYAREA
! 	select FB_CFB_IMAGEBLIT
! 	---help---
! 	  Support for the SH7760/SH7763/SH7720/SH7721 integrated
! 	  (D)STN/TFT LCD Controller.
! 	  Supports display resolutions up to 1024x1024 pixel, grayscale and
! 	  color operation, with depths ranging from 1 bpp to 8 bpp monochrome
! 	  and 8, 15 or 16 bpp color; 90 degrees clockwise display rotation for
! 	  panels <= 320 pixel horizontal resolution.

  config FB_VIRTUAL
***************
*** 2141,2144 ****
--- 2139,2154 ----
  	  the bootloader.

+ 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"