[Gc-linux-cvs] linux/drivers/video Kconfig,1.1,1.2 Makefile,1.1,1.2 fbmem.c,1.1,1.2

[<aot...@us...>]

Update of /cvsroot/gc-linux/linux/drivers/video
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25980/drivers/video

Modified Files:
	Kconfig Makefile fbmem.c 
Log Message:
Merge 2.6.2

Index: Kconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/video/Kconfig,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Kconfig	26 Jan 2004 20:07:01 -0000	1.1
+++ Kconfig	14 Feb 2004 17:50:21 -0000	1.2
@@ -109,29 +109,6 @@
 	  If you plan to use the LCD display with your SA-1100 system, say
 	  Y here.
 
-choice
-	prompt "CerfBoard LCD Display Size"
-	depends on FB_SA1100 && SA1100_CERF
-	default CERF_LCD_57_A
-
-config CERF_LCD_38_A
-	bool "3.8_Color"
-
-config CERF_LCD_38_B
-	bool "3.8_Mono"
-
-config CERF_LCD_57_A
-	bool "5.7"
-
-config CERF_LCD_72_A
-	bool "7.2"
-
-endchoice
-
-config SA1100_CERF_LCD_BACKLIGHT
-	bool "Cerfboard Backlight (CerfPDA)"
-	depends on FB_SA1100 && SA1100_CERF_CPLD
-
 config FB_CYBER2000
 	tristate "CyberPro 2000/2010/5000 support"
 	depends on FB && PCI
@@ -406,14 +383,6 @@
 	  (<file:drivers/video/pvr2fb.c>). Please see the file
 	  <file:Documentation/fb/pvr2fb.txt>.
 
-config FB_PVR2_DEBUG
-	bool "Debug pvr2fb"
-	depends on FB_PVR2=y
-	help
-	  Say Y here if you wish for the pvr2fb driver to print out debugging
-	  messages. Most people will want to say N here. If unsure, you will
-	  also want to say N.
-
 config FB_E1355
 	bool "Epson 1355 framebuffer support"
 	depends on FB && SUPERH
@@ -579,7 +548,8 @@
 
 config FB_MATROX_I2C
 	tristate "Matrox I2C support"
-	depends on FB_MATROX && I2C_ALGOBIT
+	depends on FB_MATROX && I2C
+	select I2C_ALGOBIT
 	---help---
 	  This drivers creates I2C buses which are needed for accessing the
 	  DDC (I2C) bus present on all Matroxes, an I2C bus which
@@ -734,6 +704,16 @@
 	  To compile this driver as a module, choose M here: the
 	  module will be called neofb.
 
+config FB_KYRO
+	tristate "IMG Kyro support"
+	depends on FB && PCI
+	help
+	  Say Y here if you have a STG4000 / Kyro / PowerVR 3 based
+	  graphics board.
+
+	  To compile this driver as a module, choose M here: the
+	  module will be called kyrofb.
+
 config FB_3DFX
 	tristate "3Dfx Banshee/Voodoo3 display support"
 	depends on FB && PCI

Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/video/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile	26 Jan 2004 20:07:01 -0000	1.1
+++ Makefile	14 Feb 2004 17:50:21 -0000	1.2
@@ -70,6 +70,7 @@
 obj-$(CONFIG_FB_HIT)              += hitfb.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o
 obj-$(CONFIG_FB_E1355)            += epson1355fb.o
 obj-$(CONFIG_FB_PVR2)             += pvr2fb.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o
+obj-$(CONFIG_FB_KYRO)             += kyro/ cfbfillrect.o cfbcopyarea.o cfbimgblt.o
 obj-$(CONFIG_FB_VOODOO1)          += sstfb.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o
 
 obj-$(CONFIG_FB_FFB)               += ffb.o sbuslib.o cfbimgblt.o cfbcopyarea.o

Index: fbmem.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/video/fbmem.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- fbmem.c	26 Jan 2004 20:07:01 -0000	1.1
+++ fbmem.c	14 Feb 2004 17:50:21 -0000	1.2
@@ -365,6 +365,10 @@
 #ifdef CONFIG_FB_GAMECUBE
 	{ "gamecubefb", gamecubefb_init, gamecubefb_setup },
 #endif
+#ifdef CONFIG_FB_KYRO
+	{ "kyrofb", kyrofb_init, kyrofb_setup },
+#endif
+
 	/*
 	 * Generic drivers that don't use resource management (yet)
 	 */