Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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: atkbd - add Compaq Presario R4000-series repeat quirk
Input: i8042 - add Acer Aspire 5536 to the nomux list
+43
+35
drivers/input/keyboard/atkbd.c
+35
drivers/input/keyboard/atkbd.c
···
880
880
};
881
881
882
882
/*
883
+
* Perform fixup for HP (Compaq) Presario R4000 R4100 R4200 that don't generate
884
+
* release for their volume buttons
885
+
*/
886
+
static unsigned int atkbd_hp_r4000_forced_release_keys[] = {
887
+
0xae, 0xb0, -1U
888
+
};
889
+
890
+
/*
883
891
* Samsung NC10,NC20 with Fn+F? key release not working
884
892
*/
885
893
static unsigned int atkbd_samsung_forced_release_keys[] = {
···
1543
1535
},
1544
1536
.callback = atkbd_setup_forced_release,
1545
1537
.driver_data = atkbd_hp_zv6100_forced_release_keys,
1538
+
},
1539
+
{
1540
+
.ident = "HP Presario R4000",
1541
+
.matches = {
1542
+
DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),
1543
+
DMI_MATCH(DMI_PRODUCT_NAME, "Presario R4000"),
1544
+
},
1545
+
.callback = atkbd_setup_forced_release,
1546
+
.driver_data = atkbd_hp_r4000_forced_release_keys,
1547
+
},
1548
+
{
1549
+
.ident = "HP Presario R4100",
1550
+
.matches = {
1551
+
DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),
1552
+
DMI_MATCH(DMI_PRODUCT_NAME, "Presario R4100"),
1553
+
},
1554
+
.callback = atkbd_setup_forced_release,
1555
+
.driver_data = atkbd_hp_r4000_forced_release_keys,
1556
+
},
1557
+
{
1558
+
.ident = "HP Presario R4200",
1559
+
.matches = {
1560
+
DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),
1561
+
DMI_MATCH(DMI_PRODUCT_NAME, "Presario R4200"),
1562
+
},
1563
+
.callback = atkbd_setup_forced_release,
1564
+
.driver_data = atkbd_hp_r4000_forced_release_keys,
1546
1565
},
1547
1566
{
1548
1567
.ident = "Inventec Symphony",
+8
drivers/input/serio/i8042-x86ia64io.h
+8
drivers/input/serio/i8042-x86ia64io.h
···
382
382
DMI_MATCH(DMI_PRODUCT_NAME, "Vostro1510"),
383
383
},
384
384
},
385
+
{
386
+
.ident = "Acer Aspire 5536",
387
+
.matches = {
388
+
DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
389
+
DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 5536"),
390
+
DMI_MATCH(DMI_PRODUCT_VERSION, "0100"),
391
+
},
392
+
},
385
393
{ }
386
394
};
387
395