diff options
| author | Wang Zhenyu <zhenyu.z.wang@intel.com> | 2006-08-24 10:23:22 +0800 |
|---|---|---|
| committer | Wang Zhenyu <zhenyu.z.wang@intel.com> | 2006-08-24 10:23:22 +0800 |
| commit | 078af29fa65653c5322b006404f7ad29aec24cce (patch) | |
| tree | 1c05fbbbc4e07cb6f2e930bc6048f8fa288a38f1 /src/i915_3d.c | |
| parent | 7458a6adb5ea62f56bb3d4ab19ad7d1aa6ad2d19 (diff) | |
| parent | ea63e82ef417a9918e7d7105910a8ddeba2994f6 (diff) | |
Merge branch 'master' into exa
Conflicts:
man/i810.man
src/Makefile.am
src/i830_accel.c
src/i830_dga.c
src/i830_driver.c
Diffstat (limited to 'src/i915_3d.c')
| -rw-r--r-- | src/i915_3d.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/i915_3d.c b/src/i915_3d.c index 942dbd17..e70bb24a 100644 --- a/src/i915_3d.c +++ b/src/i915_3d.c @@ -29,6 +29,7 @@ #include "config.h" #endif +#include "xf86.h" #include "i830.h" #include "i915_reg.h" |