Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d89b8f40 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/pub/scm/linux/kernel/git/dtor/input

parents 0b60afba 02860ab6

drivers/input/keyboard/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ obj-$(CONFIG_KEYBOARD_XTKBD) += xtkbd.o 
obj-$(CONFIG_KEYBOARD_AMIGA)		+= amikbd.o

obj-$(CONFIG_KEYBOARD_LOCOMO)		+= locomokbd.o

obj-$(CONFIG_KEYBOARD_NEWTON)		+= newtonkbd.o

obj-$(CONFIG_KEYBOARD_98KBD)		+= 98kbd.o

obj-$(CONFIG_KEYBOARD_CORGI)		+= corgikbd.o

obj-$(CONFIG_KEYBOARD_SPITZ)		+= spitzkbd.o

obj-$(CONFIG_KEYBOARD_HIL)		+= hil_kbd.o

drivers/input/misc/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ 
obj-$(CONFIG_INPUT_SPARCSPKR)		+= sparcspkr.o

obj-$(CONFIG_INPUT_PCSPKR)		+= pcspkr.o

obj-$(CONFIG_INPUT_M68K_BEEP)		+= m68kspkr.o

obj-$(CONFIG_INPUT_98SPKR)		+= 98spkr.o

obj-$(CONFIG_INPUT_UINPUT)		+= uinput.o

obj-$(CONFIG_INPUT_WISTRON_BTNS)	+= wistron_btns.o

obj-$(CONFIG_HP_SDC_RTC)		+= hp_sdc_rtc.o

drivers/input/misc/ixp4xx-beeper.c

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include <linux/input.h>

#include <linux/delay.h>

#include <linux/platform_device.h>

#include <linux/interrupt.h>

#include <asm/hardware.h>



MODULE_AUTHOR("Alessandro Zummo <a.zummo@towertech.it>");

drivers/input/mouse/logips2pp.c

+1 −0
Original line number Diff line number Diff line
@@ -232,6 +232,7 @@ static struct ps2pp_info *get_model_info(unsigned char model) 
		{ 88,	PS2PP_KIND_WHEEL,	PS2PP_WHEEL },

		{ 96,	0,			0 },

		{ 97,	PS2PP_KIND_TP3,		PS2PP_WHEEL | PS2PP_HWHEEL },

		{ 99,	PS2PP_KIND_WHEEL,	PS2PP_WHEEL },

		{ 100,	PS2PP_KIND_MX,					/* MX510 */

				PS2PP_WHEEL | PS2PP_SIDE_BTN | PS2PP_TASK_BTN |

				PS2PP_EXTRA_BTN | PS2PP_NAV_BTN },

drivers/input/mouse/trackpoint.c

+14 −6
Original line number Diff line number Diff line
@@ -68,15 +68,19 @@ struct trackpoint_attr_data { 
	size_t field_offset;

	unsigned char command;

	unsigned char mask;

	unsigned char inverted;

};



static ssize_t trackpoint_show_int_attr(struct psmouse *psmouse, void *data, char *buf)

{

	struct trackpoint_data *tp = psmouse->private;

	struct trackpoint_attr_data *attr = data;

	unsigned char *field = (unsigned char *)((char *)tp + attr->field_offset);

	unsigned char value = *(unsigned char *)((char *)tp + attr->field_offset);



	if (attr->inverted)

		value = !value;



	return sprintf(buf, "%u\n", *field);

	return sprintf(buf, "%u\n", value);

}



static ssize_t trackpoint_set_int_attr(struct psmouse *psmouse, void *data,
@@ -120,6 +124,9 @@ static ssize_t trackpoint_set_bit_attr(struct psmouse *psmouse, void *data, 
	if (*rest || value > 1)

		return -EINVAL;



	if (attr->inverted)

		value = !value;



	if (*field != value) {

		*field = value;

		trackpoint_toggle_bit(&psmouse->ps2dev, attr->command, attr->mask);
@@ -129,11 +136,12 @@ static ssize_t trackpoint_set_bit_attr(struct psmouse *psmouse, void *data, 
}





#define TRACKPOINT_BIT_ATTR(_name, _command, _mask)				\

#define TRACKPOINT_BIT_ATTR(_name, _command, _mask, _inv)				\

	static struct trackpoint_attr_data trackpoint_attr_##_name = {		\

		.field_offset	= offsetof(struct trackpoint_data, _name),	\

		.command	= _command,					\

		.mask		= _mask,					\

		.inverted	= _inv,						\

	};									\

	PSMOUSE_DEFINE_ATTR(_name, S_IWUSR | S_IRUGO,				\

			    &trackpoint_attr_##_name,				\
@@ -150,9 +158,9 @@ TRACKPOINT_INT_ATTR(upthresh, TP_UP_THRESH); 
TRACKPOINT_INT_ATTR(ztime, TP_Z_TIME);

TRACKPOINT_INT_ATTR(jenks, TP_JENKS_CURV);



TRACKPOINT_BIT_ATTR(press_to_select, TP_TOGGLE_PTSON, TP_MASK_PTSON);

TRACKPOINT_BIT_ATTR(skipback, TP_TOGGLE_SKIPBACK, TP_MASK_SKIPBACK);

TRACKPOINT_BIT_ATTR(ext_dev, TP_TOGGLE_EXT_DEV, TP_MASK_EXT_DEV);

TRACKPOINT_BIT_ATTR(press_to_select, TP_TOGGLE_PTSON, TP_MASK_PTSON, 0);

TRACKPOINT_BIT_ATTR(skipback, TP_TOGGLE_SKIPBACK, TP_MASK_SKIPBACK, 0);

TRACKPOINT_BIT_ATTR(ext_dev, TP_TOGGLE_EXT_DEV, TP_MASK_EXT_DEV, 1);



static struct attribute *trackpoint_attrs[] = {

	&psmouse_attr_sensitivity.dattr.attr,