From e381e25e9663bb68853d3c88d7b83994f05504c4 Mon Sep 17 00:00:00 2001 From: Anssi Hannula Date: Wed, 19 Jul 2006 01:44:08 -0400 Subject: [PATCH] --- yaml --- r: 37886 b: refs/heads/master c: 1f734cb461e1f029d751deb15c8d9f8137fb2ca7 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/linux/input.h | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 6005bdcbf0d4..b7e745ce2481 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ff462551235d8d7d843a005950bc90924fcedede +refs/heads/master: 1f734cb461e1f029d751deb15c8d9f8137fb2ca7 diff --git a/trunk/include/linux/input.h b/trunk/include/linux/input.h index d8b0c5610c04..4405d0283549 100644 --- a/trunk/include/linux/input.h +++ b/trunk/include/linux/input.h @@ -870,7 +870,6 @@ struct input_dev { unsigned long sndbit[NBITS(SND_MAX)]; unsigned long ffbit[NBITS(FF_MAX)]; unsigned long swbit[NBITS(SW_MAX)]; - int ff_effects_max; unsigned int keycodemax; unsigned int keycodesize; @@ -903,8 +902,6 @@ struct input_dev { void (*close)(struct input_dev *dev); int (*flush)(struct input_dev *dev, struct file *file); int (*event)(struct input_dev *dev, unsigned int type, unsigned int code, int value); - int (*upload_effect)(struct input_dev *dev, struct ff_effect *effect); - int (*erase_effect)(struct input_dev *dev, int effect_id); struct input_handle *grab; @@ -1078,11 +1075,6 @@ static inline void input_report_abs(struct input_dev *dev, unsigned int code, in input_event(dev, EV_ABS, code, value); } -static inline void input_report_ff(struct input_dev *dev, unsigned int code, int value) -{ - input_event(dev, EV_FF, code, value); -} - static inline void input_report_ff_status(struct input_dev *dev, unsigned int code, int value) { input_event(dev, EV_FF_STATUS, code, value);