Compiling kernel 2.4.26 fails with DRI enabled.

I'm trying to compile a 2.4.26 kernel using the patch from the SourceForge
site.  I'm using version 2.95 of gcc on Debian Sarge.  If I compile with
none of the CONFIG_DRM_$DRIVER=options set it compiles fine but if any of
them are set I get the following errors when compiling:

/usr/bin/make -C drm modules
make[4]: Entering directory /usr/src/linux-2.4.26/drivers/char/drm'
gcc -D__KERNEL__ -I/usr/src/linux-2.4.26/include -Wall -Wstrict-prototypes
-Wno-trigraphs -O2 -fno-strict-aliasing -fno-common -fomit-frame-pointer
-pipe -mpreferred-stack-boundary=2 -march=i386 -DMODULE -DMODVERSIONS
-include /usr/src/linux-2.4.26/include/linux/modversions.h-nostdinc
-iwithprefix include -DKBUILD_BASENAME=sis_drv  -c -o sis_drv.o sis_drv.c
In file included from sis_drv.c:30:
drmP.h:180: redefinition of _cmpxchg'
/usr/src/linux-2.4.26/include/asm/system.h:245: _cmpxchg' previously
defined here
make[4]: *** [sis_drv.o] Error 1
make[4]: Leaving directory /usr/src/linux-2.4.26/drivers/char/drm'
make[3]: *** [_modsubdir_drm] Error 2
make[3]: Leaving directory /usr/src/linux-2.4.26/drivers/char'
make[2]: *** [_modsubdir_char] Error 2
make[2]: Leaving directory /usr/src/linux-2.4.26/drivers'
make[1]: *** [_mod_drivers] Error 2
make[1]: Leaving directory /usr/src/linux-2.4.26'
make: *** [stamp-build] Error 2

BTW this example was with CONFIG_DRM_SIS=m but if I compile with
CONFIG_DRM_MGA=m instead then I get a similar error in that module.


Any suggestions?

-- 
Ray


-------------------------------------------------------
This SF.Net email is sponsored by:
Power Architecture Resource Center: Free content, downloads, discussions,
and more. http://solutions.newsforge.com/ibmarch.tmpl