diff options
| author | David Dawes <dawes@xfree86.org> | 2000-11-08 00:07:17 +0000 |
|---|---|---|
| committer | David Dawes <dawes@xfree86.org> | 2000-11-08 00:07:17 +0000 |
| commit | 94071289a4c61a1083a3d6b3546b06cafeaeac44 (patch) | |
| tree | ac34ab78e6e4b842fa14d61d944f26ab1376aa2d /linux/sis_mm.c | |
| parent | 5745cb7fa70cf312d371aac44de3beae2a8d6e47 (diff) | |
merge with 4.0.1d
Diffstat (limited to 'linux/sis_mm.c')
| -rw-r--r-- | linux/sis_mm.c | 5 |
1 files changed, 1 insertions, 4 deletions
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) { |