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

Commit 532df780 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: usbtouchscreen - correctly set 'phys'
  Input: i8042 - add HP Pavilion DV4270ca to the MUX blacklist
  Input: i8042 - fix modpost warning
  Input: add more Braille keycodes
parents 577107e8 7b6dff98

drivers/input/serio/i8042-x86ia64io.h

+10 −0
Original line number Diff line number Diff line
@@ -210,6 +210,16 @@ static struct dmi_system_id __initdata i8042_dmi_nomux_table[] = { 
			DMI_MATCH(DMI_PRODUCT_VERSION, "HP Pavilion Notebook ZT1000"),

		},

	},

	{

		/*

		 * Like DV4017EA does not raise AUXERR for errors on MUX ports.

		 */

		.ident = "HP Pavilion DV4270ca",

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),

			DMI_MATCH(DMI_PRODUCT_NAME, "Pavilion dv4000 (EH476UA#ABL)"),

		},

	},

	{

		.ident = "Toshiba P10",

		.matches = {

drivers/input/serio/i8042.c

+1 −1
Original line number Diff line number Diff line
@@ -1040,7 +1040,7 @@ static void __devinit i8042_register_ports(void) 
	}

}



static void __devinit i8042_unregister_ports(void)

static void __devexit i8042_unregister_ports(void)

{

	int i;

drivers/input/touchscreen/usbtouchscreen.c

+1 −1
Original line number Diff line number Diff line
@@ -767,7 +767,7 @@ static int usbtouch_probe(struct usb_interface *intf, 
			 le16_to_cpu(udev->descriptor.idProduct));



	usb_make_path(udev, usbtouch->phys, sizeof(usbtouch->phys));

	strlcpy(usbtouch->phys, "/input0", sizeof(usbtouch->phys));

	strlcat(usbtouch->phys, "/input0", sizeof(usbtouch->phys));



	input_dev->name = usbtouch->name;

	input_dev->phys = usbtouch->phys;

include/linux/input.h

+2 −0
Original line number Diff line number Diff line
@@ -558,6 +558,8 @@ struct input_absinfo { 
#define KEY_BRL_DOT6		0x1f6

#define KEY_BRL_DOT7		0x1f7

#define KEY_BRL_DOT8		0x1f8

#define KEY_BRL_DOT9		0x1f9

#define KEY_BRL_DOT10		0x1fa



/* We avoid low common keys in module aliases so they don't get huge. */

#define KEY_MIN_INTERESTING	KEY_MUTE

include/linux/keyboard.h

+3 −1
Original line number Diff line number Diff line
@@ -437,8 +437,10 @@ extern unsigned short plain_map[NR_KEYS]; 
#define K_BRL_DOT6      K(KT_BRL, 6)

#define K_BRL_DOT7      K(KT_BRL, 7)

#define K_BRL_DOT8      K(KT_BRL, 8)

#define K_BRL_DOT9      K(KT_BRL, 9)

#define K_BRL_DOT10     K(KT_BRL, 10)



#define NR_BRL		9

#define NR_BRL		11



#define MAX_DIACR	256

#endif