---

yaml --- r: 8222 b: refs/heads/master c: 544393f h: refs/heads/master v: v3
git-mirror · Sep 9, 2005 · da47fb5 · da47fb5
1 parent 2cf4a5d
commit da47fb5
Show file tree

Hide file tree

Showing 23 changed files with 14,535 additions and 18,654 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5c06e2aa6339112befdc87b350b8bf712890d7a7
+refs/heads/master: 544393fe584d333480659a4bed30f5295355df11
diff --git a/trunk/drivers/video/Kconfig b/trunk/drivers/video/Kconfig
@@ -1079,15 +1079,16 @@ config FB_SAVAGE_ACCEL
           choose N here.
 
 config FB_SIS
-	tristate "SiS acceleration"
+	tristate "SiS/XGI display support"
 	depends on FB && PCI
 	select FB_CFB_FILLRECT
 	select FB_CFB_COPYAREA
 	select FB_CFB_IMAGEBLIT
 	select FB_SOFT_CURSOR
 	help
-	  This is the frame buffer device driver for the SiS 300, 315 and
-	  330 series VGA chipsets. Specs available at <http://www.sis.com>
+	  This is the frame buffer device driver for the SiS 300, 315, 330
+	  and 340 series as well as XGI V3XT, V5, V8, Z7 graphics chipsets.
+	  Specs available at <http://www.sis.com> and <http://www.xgitech.com>.
 
 	  To compile this driver as a module, choose M here; the module
 	  will be called sisfb.
@@ -1099,11 +1100,12 @@ config FB_SIS_300
 	  Say Y here to support use of the SiS 300/305, 540, 630 and 730.
 
 config FB_SIS_315
-	bool "SiS 315/330 series support"
+	bool "SiS 315/330/340 series and XGI support"
 	depends on FB_SIS
 	help
-	  Say Y here to support use of the SiS 315 and 330 series
-	  (315/H/PRO, 55x, 650, 651, 740, 330, 661, 741, 760).
+	  Say Y here to support use of the SiS 315, 330 and 340 series
+	  (315/H/PRO, 55x, 650, 651, 740, 330, 661, 741, 760, 761) as well
+	  as XGI V3XT, V5, V8 and Z7.
 
 config FB_NEOMAGIC
 	tristate "NeoMagic display support"

diff --git a/trunk/drivers/video/sis/300vtbl.h b/trunk/drivers/video/sis/300vtbl.h
diff --git a/trunk/drivers/video/sis/310vtbl.h b/trunk/drivers/video/sis/310vtbl.h
diff --git a/trunk/drivers/video/sis/Makefile b/trunk/drivers/video/sis/Makefile
@@ -4,4 +4,4 @@
 
 obj-$(CONFIG_FB_SIS) += sisfb.o
 
-sisfb-objs := sis_main.o sis_accel.o init.o init301.o
+sisfb-objs := sis_main.o sis_accel.o init.o init301.o initextlfb.o
diff --git a/trunk/drivers/video/sis/init.c b/trunk/drivers/video/sis/init.c
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,4 +4,4 @@

		obj-$(CONFIG_FB_SIS) += sisfb.o

		sisfb-objs := sis_main.o sis_accel.o init.o init301.o
		sisfb-objs := sis_main.o sis_accel.o init.o init301.o initextlfb.o