xf86-video-intel modesetting branch not compiling

[Joel Ebel]

I wanted to test out the modesetting branch of the intel video drivers,
but it's not compiling for me.  Any assistance would be appreciated.
Here's the last of the output from my make.

Thanks,
Joel

  gcc -DHAVE_CONFIG_H -I. -I. -I.. -Wall -Wpointer-arith 
-Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations 
-Wnested-externs -fno-strict-aliasing -DXFree86Server -DIN_MODULE 
-DXFree86Module -DXFree86LOADER -I/usr/include/xorg -I/usr/local/include
-I/usr/local/include/drm -I/usr/include/X11/dri -DI830_XV -g -O2 -MT 
i830_modes.lo -MD -MP -MF .deps/i830_modes.Tpo -c i830_modes.c  -fPIC 
-DPIC -o .libs/i830_modes.o
i830_modes.c: In function 'i830GetDDCModes':
i830_modes.c:294: error: 'M_T_PREFERRED' undeclared (first use in this 
function)
i830_modes.c:294: error: (Each undeclared identifier is reported only nce
i830_modes.c:294: error: for each function it appears in.)
i830_modes.c:296: error: 'M_T_DRIVER' undeclared (first use in this 
function)
i830_modes.c: In function 'i830FPNativeMode':
i830_modes.c:425: error: 'M_T_PREFERRED' undeclared (first use in this 
function)