diff options
| author | Eric Anholt <anholt@FreeBSD.org> | 2006-08-03 17:58:56 -0700 |
|---|---|---|
| committer | Eric Anholt <anholt@FreeBSD.org> | 2006-08-03 18:29:12 -0700 |
| commit | a79aa0d7b27b0b9b032472776d7dda410fd66a98 (patch) | |
| tree | b75521103e34499e72771cd1219ccdc24fca38b2 /src/i830_dri.h | |
| parent | 760021e3983f7783900075b8c9603bd4fbe7e0a2 (diff) | |
| parent | f9e94c17c55e4c75802d8574c908744e286e7843 (diff) | |
Merge branch 'broadwater-video-rehash' into broadwater
Conflicts:
src/Makefile.am
src/common.h
src/i810_driver.c
src/i810_reg.h
src/i830.h
src/i830_accel.c
src/i830_cursor.c
src/i830_dri.c
src/i830_dri.h
src/i830_driver.c
src/i830_memory.c
src/i830_rotate.c
src/i830_video.c
Diffstat (limited to 'src/i830_dri.h')
| -rw-r--r-- | src/i830_dri.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/i830_dri.h b/src/i830_dri.h index 11987d1d..0f3be744 100644 --- a/src/i830_dri.h +++ b/src/i830_dri.h @@ -3,6 +3,7 @@ #ifndef _I830_DRI_H #define _I830_DRI_H +#include "xf86dri.h" #include "xf86drm.h" #include "i830_common.h" |