Signed-off-by: Ben Collins <[email protected]>
---
drivers/input/misc/wistron_btns.c | 19 +++++++++++++++++++
1 files changed, 19 insertions(+), 0 deletions(-)
c8521d17183d2ac5eff08d765bb4ee3bea1bf4d4
diff --git a/drivers/input/misc/wistron_btns.c b/drivers/input/misc/wistron_btns.c
index bac3085..b77e269 100644
--- a/drivers/input/misc/wistron_btns.c
+++ b/drivers/input/misc/wistron_btns.c
@@ -296,6 +296,16 @@ static struct key_entry keymap_acer_aspi
{ KE_END, 0 }
};
+static struct key_entry keymap_acer_travelmate_240[] = {
+ { KE_KEY, 0x31, KEY_MAIL },
+ { KE_KEY, 0x36, KEY_WWW },
+ { KE_KEY, 0x11, KEY_PROG1 },
+ { KE_KEY, 0x12, KEY_PROG2 },
+ { KE_BLUETOOTH, 0x44, 0 },
+ { KE_WIFI, 0x30, 0 },
+ { KE_END, 0 }
+};
+
/*
* If your machine is not here (which is currently rather likely), please send
* a list of buttons and their key codes (reported when loading this module
@@ -320,6 +330,15 @@ static struct dmi_system_id dmi_ids[] =
},
.driver_data = keymap_acer_aspire_1500
},
+ {
+ .callback = dmi_matched,
+ .ident = "Acer TravelMate 240",
+ .matches = {
+ DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
+ DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 240"),
+ },
+ .driver_data = keymap_acer_travelmate_240
+ },
{ NULL, }
};
--
1.0.5
On 1/4/06, Ben Collins <[email protected]> wrote:
> Signed-off-by: Ben Collins <[email protected]>
>
Hi Ben,
It looks like this is the patch from Ashutosh Naik, would be nice to
preserve authorship information. I have it staged for merging BTW.
Also, would you mind sending patches for input subsystem to myself,
just to ease merging task.
Thanks!
--
Dmitry
On Wed, 2006-01-04 at 17:21 -0500, Dmitry Torokhov wrote:
> On 1/4/06, Ben Collins <[email protected]> wrote:
> > Signed-off-by: Ben Collins <[email protected]>
> >
>
> Hi Ben,
>
> It looks like this is the patch from Ashutosh Naik, would be nice to
> preserve authorship information. I have it staged for merging BTW.
>
> Also, would you mind sending patches for input subsystem to myself,
> just to ease merging task.
Sorry about that. A lot of these patches I "inherited" when I took over
the Ubuntu kernel. So there are likely some authorship slip ups, which I
am happy to fix.
If this is scheduled for entry, then I'll just let it go from there.
Just wanted to make sure we weren't holding any patches back from the
rest of the world.
Thanks
--
Ben Collins <[email protected]>
Developer
Ubuntu Linux
On 1/4/06, Ben Collins <[email protected]> wrote:
>
> If this is scheduled for entry, then I'll just let it go from there.
> Just wanted to make sure we weren't holding any patches back from the
> rest of the world.
>
I was going to ask Linus to merge in the next couple of days... I will
grab your patch for i8042 if you don't mind.
Anyway, if you'd like to check what staged for merging my git tree is here:
rsync.kernel.org/pub/scm/linux/kernel/git/dtor/input.git
--
Dmitry