The patch titled input: drop the remains of the old ff interface has been added to the -mm tree. Its filename is input-drop-the-remains-of-the-old-ff-interface.patch See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: input: drop the remains of the old ff interface From: Anssi Hannula <anssi.hannula@xxxxxxxxx> Drop the now unused handlers and input_report_ff(). Signed-off-by: Anssi Hannula <anssi.hannula@xxxxxxxxx> Cc: Dmitry Torokhov <dtor_core@xxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- include/linux/input.h | 7 ------- 1 files changed, 7 deletions(-) diff -puN include/linux/input.h~input-drop-the-remains-of-the-old-ff-interface include/linux/input.h --- 25/include/linux/input.h~input-drop-the-remains-of-the-old-ff-interface Wed May 31 16:11:43 2006 +++ 25-akpm/include/linux/input.h Wed May 31 16:11:43 2006 @@ -907,8 +907,6 @@ struct input_dev { int (*accept)(struct input_dev *dev, struct file *file); 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; @@ -1144,11 +1142,6 @@ static inline void input_report_abs(stru 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); _ Patches currently in -mm which might be from anssi.hannula@xxxxxxxxx are input-move-fixp-arithh-to-drivers-input.patch input-fix-accuracy-of-fixp-arithh.patch input-new-force-feedback-interface.patch input-adapt-hid-force-feedback-drivers-for-the-new-interface.patch input-adapt-uinput-for-the-new-force-feedback-interface.patch input-adapt-iforce-driver-for-the-new-force-feedback-interface.patch input-force-feedback-driver-for-pid-devices.patch input-force-feedback-driver-for-zeroplus-devices.patch input-update-documentation-of-force-feedback.patch input-drop-the-remains-of-the-old-ff-interface.patch input-drop-the-old-pid-driver.patch input-use-enospc-instead-of-enomem-in-iforce-when-device-full.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html