patch-2.4.27 linux-2.4.27/drivers/video/sis/osdef.h

• Lines: 34
• Date: 2004-08-07 16:26:05.932399291 -0700
• Orig file: linux-2.4.26/drivers/video/sis/osdef.h
• Orig date: 2004-04-14 06:05:40.000000000 -0700

diff -urN linux-2.4.26/drivers/video/sis/osdef.h linux-2.4.27/drivers/video/sis/osdef.h
@@ -1,4 +1,5 @@
 /* $XFree86$ */
+/* $XdotOrg$ */
 /*
  * OS depending defines
  *
@@ -84,7 +85,6 @@
 
 #ifdef LINUX_KERNEL
 #include <linux/config.h>
-#include <linux/version.h>
 
 #ifdef CONFIG_FB_SIS_300
 #define SIS300
@@ -94,10 +94,6 @@
 #define SIS315H
 #endif
 
-#if 1
-#define SISFBACCEL	/* Include 2D acceleration */
-#endif
-
 #define OutPortByte(p,v) outb((u8)(v),(SISIOADDRESS)(p))
 #define OutPortWord(p,v) outw((u16)(v),(SISIOADDRESS)(p))
 #define OutPortLong(p,v) outl((u32)(v),(SISIOADDRESS)(p))
@@ -108,7 +104,7 @@
 #endif
 
 /**********************************************************************/
-/*  XFree86                                                           */
+/*  XFree86, X.org                                                    */
 /**********************************************************************/
 
 #ifdef LINUX_XF86