From 18ce40c9d31c166b49e6689c260eb1ddb3cc08c9 Mon Sep 17 00:00:00 2001 From: Alan Hourihane Date: Thu, 17 May 2001 15:20:40 +0000 Subject: Make the SiS module work again. At least glxinfo reports it's working, yet trying to run the simple apps return 'out of video memory' --- linux/sis.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'linux/sis.h') diff --git a/linux/sis.h b/linux/sis.h index b08851c1..1f33a1e2 100644 --- a/linux/sis.h +++ b/linux/sis.h @@ -30,13 +30,15 @@ #define __SIS_H__ /* This remains constant for all DRM template files. + * Name it sisdrv_##x as there's a conflict with sis_free/malloc in the kernel + * that's used for fb devices */ -#define DRM(x) sis_##x +#define DRM(x) sisdrv_##x /* General customization: */ #define __HAVE_AGP 1 -#define __MUST_HAVE_AGP 1 +#define __MUST_HAVE_AGP 0 #define __HAVE_MTRR 1 #define __HAVE_CTX_BITMAP 1 -- cgit v1.2.3