adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2025-01-01 13:46:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
* '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
This commit is contained in:
Linus Torvalds 2007-09-12 07:57:00 -07:00
commit 532df780a2
5 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
drivers/input/serio/i8042-x86ia64io.h
View file

@ -210,6 +210,16 @@ static struct dmi_system_id __initdata i8042_dmi_nomux_table[] = {
DMI_MATCH(DMI_PRODUCT_VERSION, "HP Pavilion Notebook ZT1000"), 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", .ident = "Toshiba P10",
.matches = { .matches = {

2
drivers/input/serio/i8042.c
View file

@ -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; int i;

2
drivers/input/touchscreen/usbtouchscreen.c
View file

@ -767,7 +767,7 @@ static int usbtouch_probe(struct usb_interface *intf,
le16_to_cpu(udev->descriptor.idProduct)); le16_to_cpu(udev->descriptor.idProduct));
usb_make_path(udev, usbtouch->phys, sizeof(usbtouch->phys)); 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->name = usbtouch->name;
input_dev->phys = usbtouch->phys; input_dev->phys = usbtouch->phys;

2
include/linux/input.h
View file

@ -558,6 +558,8 @@ struct input_absinfo {
#define KEY_BRL_DOT6 0x1f6 #define KEY_BRL_DOT6 0x1f6
#define KEY_BRL_DOT7 0x1f7 #define KEY_BRL_DOT7 0x1f7
#define KEY_BRL_DOT8 0x1f8 #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. */ /* We avoid low common keys in module aliases so they don't get huge. */
#define KEY_MIN_INTERESTING KEY_MUTE #define KEY_MIN_INTERESTING KEY_MUTE

4
include/linux/keyboard.h
View file

@ -437,8 +437,10 @@ extern unsigned short plain_map[NR_KEYS];
#define K_BRL_DOT6 K(KT_BRL, 6) #define K_BRL_DOT6 K(KT_BRL, 6)
#define K_BRL_DOT7 K(KT_BRL, 7) #define K_BRL_DOT7 K(KT_BRL, 7)
#define K_BRL_DOT8 K(KT_BRL, 8) #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 #define MAX_DIACR 256
#endif #endif