projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] remove kernel/kthread.c:kthread_stop_sem()
[powerpc.git]
/
include
/
linux
/
input.h
diff --git
a/include/linux/input.h
b/include/linux/input.h
index
ce1a756
..
56f1e0e
100644
(file)
--- a/
include/linux/input.h
+++ b/
include/linux/input.h
@@
-15,6
+15,7
@@
#else
#include <sys/time.h>
#include <sys/ioctl.h>
#else
#include <sys/time.h>
#include <sys/ioctl.h>
+#include <sys/types.h>
#include <asm/types.h>
#endif
#include <asm/types.h>
#endif
@@
-231,7
+232,8
@@
struct input_absinfo {
#define KEY_PAUSE 119
#define KEY_KPCOMMA 121
#define KEY_PAUSE 119
#define KEY_KPCOMMA 121
-#define KEY_HANGUEL 122
+#define KEY_HANGEUL 122
+#define KEY_HANGUEL KEY_HANGEUL
#define KEY_HANJA 123
#define KEY_YEN 124
#define KEY_LEFTMETA 125
#define KEY_HANJA 123
#define KEY_YEN 124
#define KEY_LEFTMETA 125
@@
-1004,6
+1006,7
@@
static inline void init_input_dev(struct input_dev *dev)
}
struct input_dev *input_allocate_device(void);
}
struct input_dev *input_allocate_device(void);
+void input_free_device(struct input_dev *dev);
static inline struct input_dev *input_get_device(struct input_dev *dev)
{
static inline struct input_dev *input_get_device(struct input_dev *dev)
{
@@
-1015,12
+1018,6
@@
static inline void input_put_device(struct input_dev *dev)
class_device_put(&dev->cdev);
}
class_device_put(&dev->cdev);
}
-static inline void input_free_device(struct input_dev *dev)
-{
- if (dev)
- input_put_device(dev);
-}
-
int input_register_device(struct input_dev *);
void input_unregister_device(struct input_dev *);
int input_register_device(struct input_dev *);
void input_unregister_device(struct input_dev *);