summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Zeuthen <davidz@redhat.com>2009-06-02 11:58:29 -0400
committerDavid Zeuthen <davidz@redhat.com>2009-06-02 11:58:29 -0400
commit7758f802e8395f78de219b335fc0a7237b3cb5c6 (patch)
treef4ae420a5906e5278bd38318019d4181c3d8e0c2
parent3befbb1e3daf9d7979f169d834bd3e3fb9d7c9ad (diff)
parent0ead45fcc150044d87c96105416e91e1ae6dee06 (diff)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/hotplug/udev-extras
-rw-r--r--keymap/95-keymap.rules2
-rw-r--r--keymap/keymaps/fujitsu-esprimo_mobile_v52
2 files changed, 3 insertions, 1 deletions
diff --git a/keymap/95-keymap.rules b/keymap/95-keymap.rules
index 3d473e5..1a6321d 100644
--- a/keymap/95-keymap.rules
+++ b/keymap/95-keymap.rules
@@ -65,7 +65,7 @@ ENV{DMI_VENDOR}=="INVENTEC", ATTR{[dmi/id]product_name}=="SYMPHONY 6.0/7.0", RUN
ENV{DMI_VENDOR}=="MAXDATA", ATTR{[dmi/id]product_name}=="Pro 7000*", RUN+="keymap $name maxdata-pro_7000"
-ENV{DMI_VENDOR}=="[sS][aA][mM][sS][uU][nN][gG]*", ATTR{[dmi/id]product_name}=="*NC10*|*SP55S*|*SQ45S70S*|*SX60P*|*SX30S*|*R59P/R60P/R61P*|*Q210*|*Q310*|*X05*|*P560*", RUN+="keymap $name samsung-other"
+ENV{DMI_VENDOR}=="[sS][aA][mM][sS][uU][nN][gG]*", ATTR{[dmi/id]product_name}=="*NC10*|*SP55S*|*SQ45S70S*|*SX60P*|*SX30S*|*R59P/R60P/R61P*|*Q210*|*Q310*|*X05*|*P560*|*R560*", RUN+="keymap $name samsung-other"
ENV{DMI_VENDOR}=="[sS][aA][mM][sS][uU][nN][gG]*", ATTR{[dmi/id]product_name}=="*SX20S*", RUN+="keymap $name samsung-sx20s"
ENV{DMI_VENDOR}=="[sS][aA][mM][sS][uU][nN][gG]*", ATTR{[dmi/id]product_name}=="SQ1US", RUN+="keymap $name samsung-sq1us"
diff --git a/keymap/keymaps/fujitsu-esprimo_mobile_v5 b/keymap/keymaps/fujitsu-esprimo_mobile_v5
index ff0afdb..d3d056b 100644
--- a/keymap/keymaps/fujitsu-esprimo_mobile_v5
+++ b/keymap/keymaps/fujitsu-esprimo_mobile_v5
@@ -1,2 +1,4 @@
+0xA9 switchvideomode
0xD9 brightnessdown
+0xDF sleep
0xEF brightnessup