aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2007-05-03 00:55:34 -0400
committerDmitry Torokhov <dtor@insightbb.com>2007-05-03 00:55:34 -0400
commita830df367cc8cd802b45baed2449bea267727721 (patch)
treedb0ee53a38e8fcc824e03182b25e1cefdb4f3c0e
parent4ee1fc8e554593061a71d6af7c94f31764b87606 (diff)
Input: pull input.h into uinpit.h
uinput.h relies on structures found in input.h, so pull in the header Signed-off-by: Mike Frysinger <vapier@gentoo.org> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
-rw-r--r--drivers/input/misc/uinput.c1
-rw-r--r--include/linux/uinput.h2
2 files changed, 2 insertions, 1 deletions
diff --git a/drivers/input/misc/uinput.c b/drivers/input/misc/uinput.c
index 031467eadd31..a56ad4ba8fe2 100644
--- a/drivers/input/misc/uinput.c
+++ b/drivers/input/misc/uinput.c
@@ -33,7 +33,6 @@
33#include <linux/slab.h> 33#include <linux/slab.h>
34#include <linux/module.h> 34#include <linux/module.h>
35#include <linux/init.h> 35#include <linux/init.h>
36#include <linux/input.h>
37#include <linux/smp_lock.h> 36#include <linux/smp_lock.h>
38#include <linux/fs.h> 37#include <linux/fs.h>
39#include <linux/miscdevice.h> 38#include <linux/miscdevice.h>
diff --git a/include/linux/uinput.h b/include/linux/uinput.h
index 1fd61eeed664..a6c1e8eed226 100644
--- a/include/linux/uinput.h
+++ b/include/linux/uinput.h
@@ -32,6 +32,8 @@
32 * - first public version 32 * - first public version
33 */ 33 */
34 34
35#include <linux/input.h>
36
35#define UINPUT_VERSION 3 37#define UINPUT_VERSION 3
36 38
37#ifdef __KERNEL__ 39#ifdef __KERNEL__