summaryrefslogtreecommitdiff
path: root/linux/sis.h
diff options
context:
space:
mode:
authorAlan Hourihane <alanh@fairlite.demon.co.uk>2001-05-17 15:20:40 +0000
committerAlan Hourihane <alanh@fairlite.demon.co.uk>2001-05-17 15:20:40 +0000
commit18ce40c9d31c166b49e6689c260eb1ddb3cc08c9 (patch)
treeeaa3e05a5aaf5afb387caa765a914aa9d844ad6c /linux/sis.h
parent9c775d0b2f303389c24aea5e8abc1473f0cf93e8 (diff)
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'
Diffstat (limited to 'linux/sis.h')
-rw-r--r--linux/sis.h6
1 files changed, 4 insertions, 2 deletions
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