[Intel-gfx] Compile failure on intel git after Dec 4: Move i965 video cc state to BOs.

[Andre]

[Resent, originally posted with wrong from-adress.
Not cc'ing Eric Anolt again. Sorry.]

Hi list, hi Eric,

compiling the intel driver from git head fails for me
since commit

commit 4b9d3eac57a972c055c4acd7a10dfe8aa918131c
Author: Eric Anholt <eric at anholt.net>
Date:   Thu Dec 4 13:11:13 2008 -0800

    Move i965 video cc state to BOs.

the error message is

make[4]: Entering directory `/usr/src/git/xf86-video-intel/src'
../doltcompile gcc -DHAVE_CONFIG_H -I. -I..   -I/usr/include/xorg -I/usr/include/pixman-1    -I/usr/include/drm   -Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations         -Wnested-externs -fno-strict-aliasing
-I/usr/include/xorg -I/usr/include/pixman-1   -I/usr/include/drm   -I/usr/include/X11/dri -I../uxa -DI830_XV -DI830_USE_XAA -DI830_USE_EXA -g -O2 -MT i810_driver.lo -MD -MP -MF .deps/i810_driver.Tpo -c -o i810_driver.lo i810_driver.c
In file included from i810_driver.c:88:
i830.h:573: error: expected specifier-qualifier-list before 'drm_intel_bo'
make[4]: *** [i810_driver.lo] Error 1

and all of this happens on an IBM R50e with i855gm chipset.
The error seems not to depend on the sorg-server version
it compiles against, I tried some versions from 1.5.2 to git head.

Best,
Andre Müller