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 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
[pandora-kernel.git]
/
include
/
linux
/
input.h
diff --git
a/include/linux/input.h
b/include/linux/input.h
index
056a17a
..
1bdc39a
100644
(file)
--- a/
include/linux/input.h
+++ b/
include/linux/input.h
@@
-1020,7
+1020,6
@@
struct ff_effect {
* @going_away: marks devices that are in a middle of unregistering and
* causes input_open_device*() fail with -ENODEV.
* @dev: driver model's view of this device
* @going_away: marks devices that are in a middle of unregistering and
* causes input_open_device*() fail with -ENODEV.
* @dev: driver model's view of this device
- * @cdev: union for struct device pointer
* @h_list: list of input handles associated with the device. When
* accessing the list dev->mutex must be held
* @node: used to place the device onto input_dev_list
* @h_list: list of input handles associated with the device. When
* accessing the list dev->mutex must be held
* @node: used to place the device onto input_dev_list
@@
-1085,9
+1084,6
@@
struct input_dev {
int going_away;
struct device dev;
int going_away;
struct device dev;
- union { /* temporarily so while we switching to struct device */
- struct device *dev;
- } cdev;
struct list_head h_list;
struct list_head node;
struct list_head h_list;
struct list_head node;
@@
-1311,6
+1307,9
@@
static inline void input_set_abs_params(struct input_dev *dev, int axis, int min
dev->absbit[BIT_WORD(axis)] |= BIT_MASK(axis);
}
dev->absbit[BIT_WORD(axis)] |= BIT_MASK(axis);
}
+int input_get_keycode(struct input_dev *dev, int scancode, int *keycode);
+int input_set_keycode(struct input_dev *dev, int scancode, int keycode);
+
extern struct class input_class;
/**
extern struct class input_class;
/**