upstream: applied in b3e981c9d4ff31263a43b47f83cf8db4c2b5aeff (2008-07-28)

Index: xorg-server-X11R7.0-1.0.1/hw/xfree86/os-support/linux/Makefile.am
===================================================================
--- xorg-server-X11R7.0-1.0.1.orig/hw/xfree86/os-support/linux/Makefile.am
+++ xorg-server-X11R7.0-1.0.1/hw/xfree86/os-support/linux/Makefile.am
@@ -24,7 +24,7 @@ liblinux_la_SOURCES = lnx_init.c lnx_vid
 
 AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(XORG_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@
 
-INCLUDES = $(XORG_INCS) -I/usr/include/drm # FIXME this last part is crack
+INCLUDES = $(XORG_INCS) $(LIBDRM_CFLAGS)
 
 # FIXME: These need to be added to the build
 LNX_EXTRA_SOURCES = \