Description of problem:
DRM modules won't compile with 2.6.20-1.3104.fc7 (vm_insert_pfn names conflict)

Version-Release number of selected component (if applicable):
Fedora 7-test4 and 2.6.20-1.3104.fc7

How reproducible:
100%

Steps to Reproduce:
1.Obtain current DRM source
git-clone git://anongit.freedesktop.org/git/mesa/drm
2. make
3.
  
Actual results:
[mythtv@localhost linux-core]$ make
make -C /lib/modules/2.6.20-1.3104.fc7/source  SUBDIRS=`pwd` DRMSRCDIR=`pwd` modules
make[1]: Entering directory `/usr/src/kernels/2.6.20-1.3104.fc7-i686'
  CC [M]  /home/mythtv/src/drm/linux-core/drm_compat.o
/home/mythtv/src/drm/linux-core/drm_compat.c:190: error: static declaration of
‘vm_insert_pfn’ follows non-static declaration
include/linux/mm.h:1131: error: previous declaration of ‘vm_insert_pfn’ was here
make[2]: *** [/home/mythtv/src/drm/linux-core/drm_compat.o] Error 1
make[1]: *** [_module_/home/mythtv/src/drm/linux-core] Error 2
make[1]: Leaving directory `/usr/src/kernels/2.6.20-1.3104.fc7-i686'
make: *** [modules] Error 2

Expected results:
Successful compile of DRM

Additional info:
Bug reported here to freedesktop.org but they aren't fixing it.
http://bugs.freedesktop.org/show_bug.cgi?id=10576