diff options
| author | Alan Cox <alan@lxorguk.ukuu.org.uk> | 2003-07-31 05:14:58 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.osdl.org> | 2003-07-31 05:14:58 -0700 |
| commit | b71ac811b955e2545cb287a8a5ac38846f9cd5b7 (patch) | |
| tree | 2df88413321efed9f17e096ed3edc7de4963d040 | |
| parent | 57ac16fcb1ac27ddd06964211f047f5079035153 (diff) | |
[PATCH] re-enable SiS direct render
((Gaël Le Mignot)
| -rw-r--r-- | drivers/char/drm/Kconfig | 9 | ||||
| -rw-r--r-- | drivers/char/drm/Makefile | 3 | ||||
| -rw-r--r-- | drivers/char/drm/sis_mm.c | 3 |
3 files changed, 14 insertions, 1 deletions
diff --git a/drivers/char/drm/Kconfig b/drivers/char/drm/Kconfig index 434767598790..c7ec1306feed 100644 --- a/drivers/char/drm/Kconfig +++ b/drivers/char/drm/Kconfig @@ -72,3 +72,12 @@ config DRM_MGA Choose this option if you have a Matrox G200, G400 or G450 graphics card. If M is selected, the module will be called mga. AGP support is required for this driver to work. + +config DRM_SIS + tristate "SiS video cards" + depends on DRM && AGP + help + Choose this option if you have a SiS 630 or compatibel video + chipset. If M is selected the module will be called sis. AGP + support is required for this driver to work. + diff --git a/drivers/char/drm/Makefile b/drivers/char/drm/Makefile index 4686fd2b9426..f0acc5e488af 100644 --- a/drivers/char/drm/Makefile +++ b/drivers/char/drm/Makefile @@ -10,6 +10,7 @@ i810-objs := i810_drv.o i810_dma.o i830-objs := i830_drv.o i830_dma.o i830_irq.o radeon-objs := radeon_drv.o radeon_cp.o radeon_state.o radeon_mem.o radeon_irq.o ffb-objs := ffb_drv.o ffb_context.o +sis-objs := sis_drv.o sis_ds.o sis_mm.o obj-$(CONFIG_DRM_GAMMA) += gamma.o obj-$(CONFIG_DRM_TDFX) += tdfx.o @@ -19,3 +20,5 @@ obj-$(CONFIG_DRM_MGA) += mga.o obj-$(CONFIG_DRM_I810) += i810.o obj-$(CONFIG_DRM_I830) += i830.o obj-$(CONFIG_DRM_FFB) += ffb.o +obj-$(CONFIG_DRM_SIS) += sis.o + diff --git a/drivers/char/drm/sis_mm.c b/drivers/char/drm/sis_mm.c index fe05fb517fd0..d97ee1bc7d3f 100644 --- a/drivers/char/drm/sis_mm.c +++ b/drivers/char/drm/sis_mm.c @@ -28,8 +28,9 @@ * */ +#include <linux/config.h> #include "sis.h" -#include <linux/sisfb.h> +#include "video/sisfb.h" #include "drmP.h" #include "sis_drm.h" #include "sis_drv.h" |