summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--keymaps-force-release/Makefile.am2
-rw-r--r--keymaps-force-release/samsung-series-9 (renamed from keymaps-force-release/samsung-90x3a)0
-rw-r--r--keymaps/Makefile.am2
-rw-r--r--keymaps/samsung-series-9 (renamed from keymaps/samsung-90x3a)0
-rw-r--r--rules/95-keyboard-force-release.rules2
-rw-r--r--rules/95-keymap.rules2
6 files changed, 4 insertions, 4 deletions
diff --git a/keymaps-force-release/Makefile.am b/keymaps-force-release/Makefile.am
index 1c4fb51499..8abd627014 100644
--- a/keymaps-force-release/Makefile.am
+++ b/keymaps-force-release/Makefile.am
@@ -5,5 +5,5 @@ dist_udevkeymapforcere_DATA = \
dell-xps \
hp-other \
samsung-other \
- samsung-90x3a \
+ samsung-series-9 \
common-volume-keys
diff --git a/keymaps-force-release/samsung-90x3a b/keymaps-force-release/samsung-series-9
index 65707effb7..65707effb7 100644
--- a/keymaps-force-release/samsung-90x3a
+++ b/keymaps-force-release/samsung-series-9
diff --git a/keymaps/Makefile.am b/keymaps/Makefile.am
index c809888062..0a58fb6a77 100644
--- a/keymaps/Makefile.am
+++ b/keymaps/Makefile.am
@@ -54,7 +54,7 @@ KEYMAPS = \
onkyo \
oqo-model2 \
samsung-other \
- samsung-90x3a \
+ samsung-series-9 \
samsung-sq1us \
samsung-sx20s \
toshiba-satellite_a100 \
diff --git a/keymaps/samsung-90x3a b/keymaps/samsung-series-9
index 3b65735fa0..3b65735fa0 100644
--- a/keymaps/samsung-90x3a
+++ b/keymaps/samsung-series-9
diff --git a/rules/95-keyboard-force-release.rules b/rules/95-keyboard-force-release.rules
index 3e87ed791a..5ac5a6982d 100644
--- a/rules/95-keyboard-force-release.rules
+++ b/rules/95-keyboard-force-release.rules
@@ -23,7 +23,7 @@ DRIVER!="atkbd", GOTO="force_release_end"
ENV{DMI_VENDOR}="$attr{[dmi/id]sys_vendor}"
ENV{DMI_VENDOR}=="[sS][aA][mM][sS][uU][nN][gG]*", RUN+="keyboard-force-release.sh $devpath samsung-other"
-ENV{DMI_VENDOR}=="[sS][aA][mM][sS][uU][nN][gG]*", ATTR{[dmi/id]product_name}=="*90X3A*", RUN+="keyboard-force-release.sh $devpath samsung-90x3a"
+ENV{DMI_VENDOR}=="[sS][aA][mM][sS][uU][nN][gG]*", ATTR{[dmi/id]product_name}=="*90X3A*|*900X3*|*900X4*", RUN+="keyboard-force-release.sh $devpath samsung-series-9"
ENV{DMI_VENDOR}=="Dell Inc.", ATTR{[dmi/id]product_name}=="Studio 1557|Studio 1558", RUN+="keyboard-force-release.sh $devpath common-volume-keys"
ENV{DMI_VENDOR}=="Dell Inc.", ATTR{[dmi/id]product_name}=="Latitude E*|Latitude *U|Precision M*", RUN+="keyboard-force-release.sh $devpath dell-touchpad"
diff --git a/rules/95-keymap.rules b/rules/95-keymap.rules
index 1a208492ae..b8c593e1a2 100644
--- a/rules/95-keymap.rules
+++ b/rules/95-keymap.rules
@@ -153,7 +153,7 @@ ENV{DMI_VENDOR}=="[sS][aA][mM][sS][uU][nN][gG]*", RUN+="keymap $name samsung-oth
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"
ENV{DMI_VENDOR}=="[sS][aA][mM][sS][uU][nN][gG]*", ATTR{[dmi/id]product_name}=="*700Z*", RUN+="keymap $name 0xBA ejectcd 0x96 keyboardbrightnessup 0x97 keyboardbrightnessdown"
-ENV{DMI_VENDOR}=="[sS][aA][mM][sS][uU][nN][gG]*", ATTR{[dmi/id]product_name}=="*90X3A*", RUN+="keymap $name samsung-90x3a"
+ENV{DMI_VENDOR}=="[sS][aA][mM][sS][uU][nN][gG]*", ATTR{[dmi/id]product_name}=="*90X3A*|*900X3*|*900X4*", RUN+="keymap $name samsung-series-9"
ENV{DMI_VENDOR}=="TOSHIBA", ATTR{[dmi/id]product_name}=="SATELLITE A100", RUN+="keymap $name toshiba-satellite_a100"
ENV{DMI_VENDOR}=="TOSHIBA", ATTR{[dmi/id]product_name}=="Satellite A110", RUN+="keymap $name toshiba-satellite_a110"