Message ID | 1311059153-13892-2-git-send-email-kengyu@canonical.com |
---|---|
State | New |
Headers | show |
On Tue, Jul 19, 2011 at 03:05:53PM +0800, Keng-Yu Lin wrote: > From: Corentin Chary <corentin.chary@gmail.com> > > BugLink: http://bugs.launchpad.net/bugs/812644 > > Signed-off-by: Corentin Chary <corentin.chary@gmail.com> > Signed-off-by: Matthew Garrett <mjg@redhat.com> > > (cherry picked from commit 9481472559b3ecd366390786628c2fb211d1477b) > Signed-off-by: Keng-Yu Lin <kengyu@canonical.com> > --- > drivers/platform/x86/eeepc-wmi.c | 2 ++ > 1 files changed, 2 insertions(+), 0 deletions(-) > > diff --git a/drivers/platform/x86/eeepc-wmi.c b/drivers/platform/x86/eeepc-wmi.c > index a44a510..6afd643 100644 > --- a/drivers/platform/x86/eeepc-wmi.c > +++ b/drivers/platform/x86/eeepc-wmi.c > @@ -122,10 +122,12 @@ static const struct key_entry eeepc_wmi_keymap[] = { > { KE_KEY, 0x5d, { KEY_WLAN } }, > { KE_KEY, 0x6b, { KEY_F13 } }, /* Disable Touchpad */ > { KE_KEY, 0x88, { KEY_WLAN } }, > + { KE_KEY, 0xbd, { KEY_CAMERA } }, > { KE_KEY, 0xcc, { KEY_SWITCHVIDEOMODE } }, > { KE_KEY, 0xe0, { KEY_PROG1 } }, /* Task Manager */ > { KE_KEY, 0xe1, { KEY_F14 } }, /* Change Resolution */ > { KE_KEY, HOME_PRESS, { KEY_CONFIG } }, > + { KE_KEY, 0xe8, { KEY_SCREENLOCK } }, > { KE_KEY, 0xe9, { KEY_BRIGHTNESS_ZERO } }, > { KE_END, 0}, > }; Changes match upstream and very low risk, so: Acked-by: Seth Forshee <seth.forshee@canonical.com>
On Tue, 2011-07-19 at 15:05 +0800, Keng-Yu Lin wrote: > From: Corentin Chary <corentin.chary@gmail.com> > > BugLink: http://bugs.launchpad.net/bugs/812644 > > Signed-off-by: Corentin Chary <corentin.chary@gmail.com> > Signed-off-by: Matthew Garrett <mjg@redhat.com> > > (cherry picked from commit 9481472559b3ecd366390786628c2fb211d1477b) > Signed-off-by: Keng-Yu Lin <kengyu@canonical.com> Positive test results and seems very low risk of regression. Acked-by: Leann Ogasawara <leann.ogasawara@canonical.com> > --- > drivers/platform/x86/eeepc-wmi.c | 2 ++ > 1 files changed, 2 insertions(+), 0 deletions(-) > > diff --git a/drivers/platform/x86/eeepc-wmi.c b/drivers/platform/x86/eeepc-wmi.c > index a44a510..6afd643 100644 > --- a/drivers/platform/x86/eeepc-wmi.c > +++ b/drivers/platform/x86/eeepc-wmi.c > @@ -122,10 +122,12 @@ static const struct key_entry eeepc_wmi_keymap[] = { > { KE_KEY, 0x5d, { KEY_WLAN } }, > { KE_KEY, 0x6b, { KEY_F13 } }, /* Disable Touchpad */ > { KE_KEY, 0x88, { KEY_WLAN } }, > + { KE_KEY, 0xbd, { KEY_CAMERA } }, > { KE_KEY, 0xcc, { KEY_SWITCHVIDEOMODE } }, > { KE_KEY, 0xe0, { KEY_PROG1 } }, /* Task Manager */ > { KE_KEY, 0xe1, { KEY_F14 } }, /* Change Resolution */ > { KE_KEY, HOME_PRESS, { KEY_CONFIG } }, > + { KE_KEY, 0xe8, { KEY_SCREENLOCK } }, > { KE_KEY, 0xe9, { KEY_BRIGHTNESS_ZERO } }, > { KE_END, 0}, > }; > -- > 1.7.4.1 > >
diff --git a/drivers/platform/x86/eeepc-wmi.c b/drivers/platform/x86/eeepc-wmi.c index a44a510..6afd643 100644 --- a/drivers/platform/x86/eeepc-wmi.c +++ b/drivers/platform/x86/eeepc-wmi.c @@ -122,10 +122,12 @@ static const struct key_entry eeepc_wmi_keymap[] = { { KE_KEY, 0x5d, { KEY_WLAN } }, { KE_KEY, 0x6b, { KEY_F13 } }, /* Disable Touchpad */ { KE_KEY, 0x88, { KEY_WLAN } }, + { KE_KEY, 0xbd, { KEY_CAMERA } }, { KE_KEY, 0xcc, { KEY_SWITCHVIDEOMODE } }, { KE_KEY, 0xe0, { KEY_PROG1 } }, /* Task Manager */ { KE_KEY, 0xe1, { KEY_F14 } }, /* Change Resolution */ { KE_KEY, HOME_PRESS, { KEY_CONFIG } }, + { KE_KEY, 0xe8, { KEY_SCREENLOCK } }, { KE_KEY, 0xe9, { KEY_BRIGHTNESS_ZERO } }, { KE_END, 0}, };