36 lines
1.2 KiB
Diff
36 lines
1.2 KiB
Diff
|
From c5396ec05a5c6cab6608ba677f703c5227b1de13 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Thierry Reding <thierry.reding@avionic-design.de>
|
||
|
|
Date: Wed, 17 Oct 2012 12:11:49 +0200
|
||
|
|
Subject: [PATCH] xf86: Fix build against recent Linux kernel
|
||
|
|
|
||
|
|
Recent Linux kernels reworked the linux/input.h header file, which is
|
||
|
|
now part of the "user-space API". The include guard therefore has an
|
||
|
|
additional additional _UAPI prefix.
|
||
|
|
|
||
|
|
Instead of adding another case to the #ifdef, drop any include guard
|
||
|
|
checks and instead always undefine the BUS_* definitions on Linux.
|
||
|
|
|
||
|
|
Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de>
|
||
|
|
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||
|
|
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||
|
|
---
|
||
|
|
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..4c2d147 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)
|
||
|
|
#undef BUS_NONE
|
||
|
|
#undef BUS_PCI
|
||
|
|
#undef BUS_SBUS
|
||
|
|
--
|
||
|
|
1.7.11.7
|
||
|
|
|