diff options
| author | Ian Romanick <idr@us.ibm.com> | 2004-03-03 21:16:36 +0000 |
|---|---|---|
| committer | Ian Romanick <idr@us.ibm.com> | 2004-03-03 21:16:36 +0000 |
| commit | 6bb28dade35ef35f5e677bb1d2c2107dc588750e (patch) | |
| tree | beb6af31957e04b2a06d42ade5c5203bb7aaa30f /shared/sis_mm.c | |
| parent | 2b9c12ef83b8de5acba782918212f7fa250c9e45 (diff) | |
Merge changes from DRI trunk.driinterface-0-0-3-20040303driinterface-0-0-3-branch
Obtained from: DRI trunk
Diffstat (limited to 'shared/sis_mm.c')
| -rw-r--r-- | shared/sis_mm.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/shared/sis_mm.c b/shared/sis_mm.c index b6ff069d..092096c4 100644 --- a/shared/sis_mm.c +++ b/shared/sis_mm.c @@ -34,8 +34,12 @@ #include "sis_drv.h" #include "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 |