The patch titled
wistron_btns: add support for fujitsu-siemens amilo pro edition v3505
has been added to the -mm tree. Its filename is
wistron_btns-add-support-for-fujitsu-siemens-amilo-pro-edition-v3505.patch
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: wistron_btns: add support for fujitsu-siemens amilo pro edition v3505
From: Remi Herilier <rherilier@xxxxxxxx>
Wistron button support for Fujitsu-Siemens Amilo Pro Edition V3505.
Signed-off-by: Remi Herilier <rherilier@xxxxxxxx>
Cc: Dmitry Torokhov <dtor@xxxxxxx>
Cc: Jiri Kosina <jikos@xxxxxxxx>
Cc: Miloslav Trmac <mitr@xxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/input/misc/wistron_btns.c | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
diff -puN drivers/input/misc/wistron_btns.c~wistron_btns-add-support-for-fujitsu-siemens-amilo-pro-edition-v3505 drivers/input/misc/wistron_btns.c
--- a/drivers/input/misc/wistron_btns.c~wistron_btns-add-support-for-fujitsu-siemens-amilo-pro-edition-v3505
+++ a/drivers/input/misc/wistron_btns.c
@@ -285,6 +285,16 @@ static struct key_entry keymap_fs_amilo_
{ KE_END, 0 }
};
+static struct key_entry keymap_fs_amilo_pro_v3505[] __initdata = {
+ { KE_KEY, 0x01, {KEY_HELP} }, /* Fn+F1 */
+ { KE_KEY, 0x06, {KEY_DISPLAYTOGGLE} }, /* Fn+F4 */
+ { KE_BLUETOOTH, 0x30 }, /* Fn+F10 */
+ { KE_KEY, 0x31, {KEY_MAIL} }, /* mail button */
+ { KE_KEY, 0x36, {KEY_WWW} }, /* www button */
+ { KE_WIFI, 0x78 }, /* satelite dish button */
+ { KE_END, 0 }
+};
+
static struct key_entry keymap_fujitsu_n3510[] __initdata = {
{ KE_KEY, 0x11, {KEY_PROG1} },
{ KE_KEY, 0x12, {KEY_PROG2} },
@@ -626,6 +636,15 @@ static struct dmi_system_id dmi_ids[] __
},
{
.callback = dmi_matched,
+ .ident = "Fujitsu-Siemens Amilo Pro Edition V3505",
+ .matches = {
+ DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU SIEMENS"),
+ DMI_MATCH(DMI_PRODUCT_NAME, "AMILO Pro Edition V3505"),
+ },
+ .driver_data = keymap_fs_amilo_pro_v3505
+ },
+ {
+ .callback = dmi_matched,
.ident = "Fujitsu-Siemens Amilo M7400",
.matches = {
DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU SIEMENS"),
_
Patches currently in -mm which might be from rherilier@xxxxxxxx are
wistron_btns-add-support-for-x86_64-systems.patch
wistron_btns-add-support-for-fujitsu-siemens-amilo-pro-edition-v3505.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
