summaryrefslogtreecommitdiff
path: root/keymaps
diff options
context:
space:
mode:
authorRichard Yao <ryao@gentoo.org>2013-03-17 12:50:36 -0400
committerRichard Yao <ryao@cs.stonybrook.edu>2013-03-17 12:50:36 -0400
commit788245436d3c9e3fbc84285d60f3b4c40e18c207 (patch)
tree2983d000a6b91e6c6f0877fadc14b47df5e0adee /keymaps
parent15cad0e19bc6e79fe70b23b1b0f076ab23d4d7a4 (diff)
parent261132097e647d259c851b32c3c5798fa13cc67a (diff)
Merge remote-tracking branch 'origin/follow-upstream'
Signed-off-by: Richard Yao <ryao@gentoo.org>
Diffstat (limited to 'keymaps')
-rw-r--r--keymaps/Makefile.am3
-rw-r--r--keymaps/hewlett-packard-hdx9494nr3
-rw-r--r--keymaps/samsung-series-9 (renamed from keymaps/samsung-90x3a)0
3 files changed, 5 insertions, 1 deletions
diff --git a/keymaps/Makefile.am b/keymaps/Makefile.am
index c809888062..e8f5a60110 100644
--- a/keymaps/Makefile.am
+++ b/keymaps/Makefile.am
@@ -28,6 +28,7 @@ KEYMAPS = \
hewlett-packard-tablet \
hewlett-packard-tx2 \
hewlett-packard_elitebook-8440p \
+ hewlett-packard-hdx9494nr \
ibm-thinkpad-usb-keyboard-trackpoint \
inventec-symphony_6.0_7.0 \
lenovo-3000 \
@@ -54,7 +55,7 @@ KEYMAPS = \
onkyo \
oqo-model2 \
samsung-other \
- samsung-90x3a \
+ samsung-series-9 \
samsung-sq1us \
samsung-sx20s \
toshiba-satellite_a100 \
diff --git a/keymaps/hewlett-packard-hdx9494nr b/keymaps/hewlett-packard-hdx9494nr
new file mode 100644
index 0000000000..f3484e125a
--- /dev/null
+++ b/keymaps/hewlett-packard-hdx9494nr
@@ -0,0 +1,3 @@
+0xB2 www # FnF3
+0xD8 f22 # touchpad off
+0xD9 f23 # touchpad on
diff --git a/keymaps/samsung-90x3a b/keymaps/samsung-series-9
index 3b65735fa0..3b65735fa0 100644
--- a/keymaps/samsung-90x3a
+++ b/keymaps/samsung-series-9