From 94071289a4c61a1083a3d6b3546b06cafeaeac44 Mon Sep 17 00:00:00 2001
From: David Dawes <dawes@xfree86.org>
Date: Wed, 8 Nov 2000 00:07:17 +0000
Subject: merge with 4.0.1d

---
 linux/sis_mm.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'linux/sis_mm.c')

diff --git a/linux/sis_mm.c b/linux/sis_mm.c
index e6e8ed7d..9a8f83ea 100644
--- a/linux/sis_mm.c
+++ b/linux/sis_mm.c
@@ -33,9 +33,6 @@
 #include "sis_drm.h"
 #include "sis_ds.h"
 #include "sis_drv.h"
-#include <linux/fb.h>
-#include <linux/sisfb.h>
-#include <linux/interrupt.h>
 
 #define MAX_CONTEXT 100
 #define VIDEO_TYPE 0 
@@ -73,7 +70,7 @@ static int del_alloc_set(int context, int type, unsigned int val)
 }
 
 /* fb management via fb device */ 
-#if 1
+#if 0
 int sis_fb_alloc(struct inode *inode, struct file *filp, unsigned int cmd,
 		  unsigned long arg)
 {
-- 
cgit v1.2.3