diff options
| author | anholt <anholt@FreeBSD.org> | 2004-06-11 03:26:59 +0000 |
|---|---|---|
| committer | anholt <anholt@FreeBSD.org> | 2004-06-11 03:26:59 +0000 |
| commit | be5dc242b6a2d2549e38e77baf82adb7b33b042b (patch) | |
| tree | dc68be4b837d82c81a81bb2cec14ded275766e76 /sys/dev/drm/sis_mm.c | |
| parent | da6e1707d47446b0f3de71fd5a924233a2168f65 (diff) | |
| download | FreeBSD-src-be5dc242b6a2d2549e38e77baf82adb7b33b042b.zip FreeBSD-src-be5dc242b6a2d2549e38e77baf82adb7b33b042b.tar.gz | |
Merge from DRI CVS as of 2004-05-26. Most of the meat is new PCI IDs and a new
packet for Radeon.
Diffstat (limited to 'sys/dev/drm/sis_mm.c')
| -rw-r--r-- | sys/dev/drm/sis_mm.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sys/dev/drm/sis_mm.c b/sys/dev/drm/sis_mm.c index 837e224..6f29974 100644 --- a/sys/dev/drm/sis_mm.c +++ b/sys/dev/drm/sis_mm.c @@ -35,8 +35,12 @@ #include "dev/drm/sis_drv.h" #include "dev/drm/sis_ds.h" #if defined(__linux__) && defined(CONFIG_FB_SIS) +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) +#include <video/sisfb.h> +#else #include <linux/sisfb.h> #endif +#endif #define MAX_CONTEXT 100 #define VIDEO_TYPE 0 |
