diff --git a/[refs] b/[refs] index a9b1fead2ca8..dd179f114cd6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ccd3474569a101914444dc37cc108eec22578999 +refs/heads/master: 253b00f1e6619055d524188f254ccb951bffce5d diff --git a/trunk/drivers/char/keyboard.c b/trunk/drivers/char/keyboard.c index 7f7e798c1384..d0369e05490a 100644 --- a/trunk/drivers/char/keyboard.c +++ b/trunk/drivers/char/keyboard.c @@ -46,6 +46,8 @@ extern void ctrl_alt_del(void); +#define to_handle_h(n) container_of(n, struct input_handle, h_node) + /* * Exported functions/variables */ diff --git a/trunk/include/linux/input.h b/trunk/include/linux/input.h index 28a094fcfe20..eff711d8a459 100644 --- a/trunk/include/linux/input.h +++ b/trunk/include/linux/input.h @@ -1213,11 +1213,6 @@ struct input_handle { struct list_head h_node; }; -#define to_dev(n) container_of(n, struct input_dev, node) -#define to_handler(n) container_of(n, struct input_handler, node) -#define to_handle(n) container_of(n, struct input_handle, d_node) -#define to_handle_h(n) container_of(n, struct input_handle, h_node) - struct input_dev *input_allocate_device(void); void input_free_device(struct input_dev *dev);