git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6
[pandora-kernel.git]
/
include
/
linux
/
uinput.h
diff --git
a/include/linux/uinput.h
b/include/linux/uinput.h
index
1fd61ee
..
60c81da
100644
(file)
--- a/
include/linux/uinput.h
+++ b/
include/linux/uinput.h
@@
-32,6
+32,8
@@
* - first public version
*/
* - first public version
*/
+#include <linux/input.h>
+
#define UINPUT_VERSION 3
#ifdef __KERNEL__
#define UINPUT_VERSION 3
#ifdef __KERNEL__
@@
-160,19
+162,15
@@
struct uinput_ff_erase {
#define UI_FF_UPLOAD 1
#define UI_FF_ERASE 2
#define UI_FF_UPLOAD 1
#define UI_FF_ERASE 2
-#ifndef NBITS
-#define NBITS(x) ((((x)-1)/(sizeof(long)*8))+1)
-#endif /* NBITS */
-
#define UINPUT_MAX_NAME_SIZE 80
struct uinput_user_dev {
char name[UINPUT_MAX_NAME_SIZE];
struct input_id id;
#define UINPUT_MAX_NAME_SIZE 80
struct uinput_user_dev {
char name[UINPUT_MAX_NAME_SIZE];
struct input_id id;
-
int ff_effects_max;
-
int absmax[ABS_MAX + 1
];
-
int absmin[ABS_MAX + 1
];
-
int absfuzz[ABS_MAX + 1
];
-
int absflat[ABS_MAX + 1
];
+ int ff_effects_max;
+
int absmax[ABS_CNT
];
+
int absmin[ABS_CNT
];
+
int absfuzz[ABS_CNT
];
+
int absflat[ABS_CNT
];
};
#endif /* __UINPUT_H_ */
};
#endif /* __UINPUT_H_ */