X Strike Force X.Org X11 SVN commit: r2474 - in trunk/xserver/xorg-server-1.0.2: debian hw/xfree86/os-support/linux
Author: jurij
Date: 2006-07-18 03:21:07 -0400 (Tue, 18 Jul 2006)
New Revision: 2474
Modified:
trunk/xserver/xorg-server-1.0.2/debian/changelog
trunk/xserver/xorg-server-1.0.2/hw/xfree86/os-support/linux/lnx_io.c
trunk/xserver/xorg-server-1.0.2/hw/xfree86/os-support/linux/lnx_kbd.c
Log:
Stop including the non-existent asm/kbio.h header file in
hw/xfree86/os-support/linux/lnx_{io,kbd}.c to avoid the build failure
on sparc. This change does not affect any other architecture
besides sparc.
Modified: trunk/xserver/xorg-server-1.0.2/debian/changelog
===================================================================
--- trunk/xserver/xorg-server-1.0.2/debian/changelog 2006-07-17 08:35:49 UTC (rev 2473)
+++ trunk/xserver/xorg-server-1.0.2/debian/changelog 2006-07-18 07:21:07 UTC (rev 2474)
@@ -12,6 +12,11 @@
See http://lists.freedesktop.org/archives/xorg/2006-June/016146.html for
the full advisory.
+ [ Jurij Smakov ]
+ * Stop including the non-existent asm/kbio.h header file in
+ hw/xfree86/os-support/linux/lnx_{io,kbd}.c to avoid the build failure
+ on sparc.
+
-- David Nusinow <dnusinow@debian.org> Sat, 1 Jul 2006 17:20:45 -0400
xorg-server (1:1.0.2-8) unstable; urgency=low
Modified: trunk/xserver/xorg-server-1.0.2/hw/xfree86/os-support/linux/lnx_io.c
===================================================================
--- trunk/xserver/xorg-server-1.0.2/hw/xfree86/os-support/linux/lnx_io.c 2006-07-17 08:35:49 UTC (rev 2473)
+++ trunk/xserver/xorg-server-1.0.2/hw/xfree86/os-support/linux/lnx_io.c 2006-07-18 07:21:07 UTC (rev 2474)
@@ -74,7 +74,6 @@
#include <linux/version.h>
#ifdef __sparc__
#include <asm/param.h>
-#include <asm/kbio.h>
#endif
/* Deal with spurious kernel header change in struct kbd_repeat.
Modified: trunk/xserver/xorg-server-1.0.2/hw/xfree86/os-support/linux/lnx_kbd.c
===================================================================
--- trunk/xserver/xorg-server-1.0.2/hw/xfree86/os-support/linux/lnx_kbd.c 2006-07-17 08:35:49 UTC (rev 2473)
+++ trunk/xserver/xorg-server-1.0.2/hw/xfree86/os-support/linux/lnx_kbd.c 2006-07-18 07:21:07 UTC (rev 2474)
@@ -104,7 +104,6 @@
#include <linux/version.h>
#ifdef __sparc__
#include <asm/param.h>
-#include <asm/kbio.h>
#endif
/* Deal with spurious kernel header change in struct kbd_repeat.
Reply to: