diff options
| author | Eric Anholt <eric@anholt.net> | 2006-09-08 11:02:41 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2006-09-08 11:02:41 -0700 |
| commit | 2b7602847aa7ae9b4e88fbea070710695d2cb8a4 (patch) | |
| tree | d6349b602d1d4682e6d1df4f58679cb1ea823564 /src/i915_3d.c | |
| parent | e4cdc42a98dd1be74e5c2bf5d9566f7449523b14 (diff) | |
| parent | b45f4b54b189a496255ddae12af38fc4c4408a51 (diff) | |
Merge branch 'exa-origin' into exa
Conflicts:
src/i915_exa_render.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" |