[PATCH] xf86: Fix build against recent Linux kernel

Thierry Reding thierry.reding at avionic-design.de
Mon Oct 15 10:36:58 PDT 2012


Recent Linux kernels reworked the linux/input.h header file, which is
now part of the "user-space API" and the include guard has an additional
_UAPI prefix.

Signed-off-by: Thierry Reding <thierry.reding at avionic-design.de>
---
 hw/xfree86/common/xf86str.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/xfree86/common/xf86str.h b/hw/xfree86/common/xf86str.h
index 0590262..845c083 100644
--- a/hw/xfree86/common/xf86str.h
+++ b/hw/xfree86/common/xf86str.h
@@ -347,7 +347,7 @@ typedef struct _DriverRec {
  */
 
 /* Tolerate prior #include <linux/input.h> */
-#if defined(linux) && defined(_INPUT_H)
+#if defined(linux) && (defined(_INPUT_H) || defined(_UAPI_INPUT_H))
 #undef BUS_NONE
 #undef BUS_PCI
 #undef BUS_SBUS
-- 
1.7.12.2



More information about the xorg-devel mailing list