Merge branch 'for-linus' of gregkh@master.kernel.org:/pub/scm/linux/kernel/git/dtor/input (b7277155) · Commits · e / devices / android_kernel_teracube_2e

Documentation/input/joystick.txt

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -39,7 +39,6 @@ them. Bug reports and success stories are also welcome.

	The input project website is at:		The input project website is at:

	http://www.suse.cz/development/input/
	http://atrey.karlin.mff.cuni.cz/~vojtech/input/		http://atrey.karlin.mff.cuni.cz/~vojtech/input/

	There is also a mailing list for the driver at:		There is also a mailing list for the driver at:

drivers/input/keyboard/atkbd.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -498,7 +498,7 @@ static int atkbd_set_repeat_rate(struct atkbd *atkbd)
	i++;		i++;
	dev->rep[REP_PERIOD] = period[i];		dev->rep[REP_PERIOD] = period[i];

	while (j < ARRAY_SIZE(period) - 1 && delay[j] < dev->rep[REP_DELAY])		while (j < ARRAY_SIZE(delay) - 1 && delay[j] < dev->rep[REP_DELAY])
	j++;		j++;
	dev->rep[REP_DELAY] = delay[j];		dev->rep[REP_DELAY] = delay[j];

drivers/input/misc/wistron_btns.c

+8 −8

Original line number	Original line	Diff line number	Diff line
	@@ -259,11 +259,11 @@ static int __init dmi_matched(struct dmi_system_id *dmi)
	return 1;		return 1;
	}		}

	static struct key_entry keymap_empty[] __initdata = {		static struct key_entry keymap_empty[] = {
	{ KE_END, 0 }		{ KE_END, 0 }
	};		};

	static struct key_entry keymap_fs_amilo_pro_v2000[] __initdata = {		static struct key_entry keymap_fs_amilo_pro_v2000[] = {
	{ KE_KEY, 0x01, KEY_HELP },		{ KE_KEY, 0x01, KEY_HELP },
	{ KE_KEY, 0x11, KEY_PROG1 },		{ KE_KEY, 0x11, KEY_PROG1 },
	{ KE_KEY, 0x12, KEY_PROG2 },		{ KE_KEY, 0x12, KEY_PROG2 },
	@@ -273,7 +273,7 @@ static struct key_entry keymap_fs_amilo_pro_v2000[] __initdata = {
	{ KE_END, 0 }		{ KE_END, 0 }
	};		};

	static struct key_entry keymap_fujitsu_n3510[] __initdata = {		static struct key_entry keymap_fujitsu_n3510[] = {
	{ KE_KEY, 0x11, KEY_PROG1 },		{ KE_KEY, 0x11, KEY_PROG1 },
	{ KE_KEY, 0x12, KEY_PROG2 },		{ KE_KEY, 0x12, KEY_PROG2 },
	{ KE_KEY, 0x36, KEY_WWW },		{ KE_KEY, 0x36, KEY_WWW },
	@@ -285,7 +285,7 @@ static struct key_entry keymap_fujitsu_n3510[] __initdata = {
	{ KE_END, 0 }		{ KE_END, 0 }
	};		};

	static struct key_entry keymap_wistron_ms2111[] __initdata = {		static struct key_entry keymap_wistron_ms2111[] = {
	{ KE_KEY, 0x11, KEY_PROG1 },		{ KE_KEY, 0x11, KEY_PROG1 },
	{ KE_KEY, 0x12, KEY_PROG2 },		{ KE_KEY, 0x12, KEY_PROG2 },
	{ KE_KEY, 0x13, KEY_PROG3 },		{ KE_KEY, 0x13, KEY_PROG3 },
	@@ -294,7 +294,7 @@ static struct key_entry keymap_wistron_ms2111[] __initdata = {
	{ KE_END, 0 }		{ KE_END, 0 }
	};		};

	static struct key_entry keymap_wistron_ms2141[] __initdata = {		static struct key_entry keymap_wistron_ms2141[] = {
	{ KE_KEY, 0x11, KEY_PROG1 },		{ KE_KEY, 0x11, KEY_PROG1 },
	{ KE_KEY, 0x12, KEY_PROG2 },		{ KE_KEY, 0x12, KEY_PROG2 },
	{ KE_WIFI, 0x30, 0 },		{ KE_WIFI, 0x30, 0 },
	@@ -307,7 +307,7 @@ static struct key_entry keymap_wistron_ms2141[] __initdata = {
	{ KE_END, 0 }		{ KE_END, 0 }
	};		};

	static struct key_entry keymap_acer_aspire_1500[] __initdata = {		static struct key_entry keymap_acer_aspire_1500[] = {
	{ KE_KEY, 0x11, KEY_PROG1 },		{ KE_KEY, 0x11, KEY_PROG1 },
	{ KE_KEY, 0x12, KEY_PROG2 },		{ KE_KEY, 0x12, KEY_PROG2 },
	{ KE_WIFI, 0x30, 0 },		{ KE_WIFI, 0x30, 0 },
	@@ -317,7 +317,7 @@ static struct key_entry keymap_acer_aspire_1500[] __initdata = {
	{ KE_END, 0 }		{ KE_END, 0 }
	};		};

	static struct key_entry keymap_acer_travelmate_240[] __initdata = {		static struct key_entry keymap_acer_travelmate_240[] = {
	{ KE_KEY, 0x31, KEY_MAIL },		{ KE_KEY, 0x31, KEY_MAIL },
	{ KE_KEY, 0x36, KEY_WWW },		{ KE_KEY, 0x36, KEY_WWW },
	{ KE_KEY, 0x11, KEY_PROG1 },		{ KE_KEY, 0x11, KEY_PROG1 },
	@@ -327,7 +327,7 @@ static struct key_entry keymap_acer_travelmate_240[] __initdata = {
	{ KE_END, 0 }		{ KE_END, 0 }
	};		};

	static struct key_entry keymap_aopen_1559as[] __initdata = {		static struct key_entry keymap_aopen_1559as[] = {
	{ KE_KEY, 0x01, KEY_HELP },		{ KE_KEY, 0x01, KEY_HELP },
	{ KE_KEY, 0x06, KEY_PROG3 },		{ KE_KEY, 0x06, KEY_PROG3 },
	{ KE_KEY, 0x11, KEY_PROG1 },		{ KE_KEY, 0x11, KEY_PROG1 },

drivers/input/mouse/psmouse-base.c

+0 −7

Original line number	Original line	Diff line number	Diff line
	@@ -485,13 +485,6 @@ static int im_explorer_detect(struct psmouse *psmouse, int set_properties)
	param[0] = 40;		param[0] = 40;
	ps2_command(ps2dev, param, PSMOUSE_CMD_SETRATE);		ps2_command(ps2dev, param, PSMOUSE_CMD_SETRATE);

	param[0] = 200;
	ps2_command(ps2dev, param, PSMOUSE_CMD_SETRATE);
	param[0] = 200;
	ps2_command(ps2dev, param, PSMOUSE_CMD_SETRATE);
	param[0] = 60;
	ps2_command(ps2dev, param, PSMOUSE_CMD_SETRATE);

	if (set_properties) {		if (set_properties) {
	set_bit(BTN_MIDDLE, psmouse->dev->keybit);		set_bit(BTN_MIDDLE, psmouse->dev->keybit);
	set_bit(REL_WHEEL, psmouse->dev->relbit);		set_bit(REL_WHEEL, psmouse->dev->relbit);