From f5e157731e6b51421ac89cfefb666b8bbf971b03 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Wed, 17 Jul 2013 13:18:21 +0200
Subject: mesa mkfontscale xserver git update 17 Jul 2013

xserver          commit 74469895e39fa38337f59edd64c4031ab9bb51d8
mkfontscale      commit f48de13423c7300f4da9f61993b624426b38ddc0
mesa             commit b20e0fb5204ea85904e9f72f583e65bf35b446cb
---
 xorg-server/hw/xfree86/os-support/xf86_OSlib.h | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'xorg-server/hw/xfree86/os-support')

diff --git a/xorg-server/hw/xfree86/os-support/xf86_OSlib.h b/xorg-server/hw/xfree86/os-support/xf86_OSlib.h
index e931b09a1..eb0a338c9 100644
--- a/xorg-server/hw/xfree86/os-support/xf86_OSlib.h
+++ b/xorg-server/hw/xfree86/os-support/xf86_OSlib.h
@@ -277,12 +277,7 @@ struct pcvtid {
 #include <dev/wscons/wsdisplay_usl_io.h>
 #endif                          /* WSCONS_SUPPORT */
 #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
-#if defined(__FreeBSD_kernel_version) && (__FreeBSD_kernel_version >= 500013)
 #include <sys/mouse.h>
-#else
-#undef MOUSE_GETINFO
-#include <machine/mouse.h>
-#endif
 #endif
     /* Include these definitions in case ioctl_pc.h didn't get included */
 #ifndef CONSOLE_X_MODE_ON
-- 
cgit v1.2.3