diff options
-rw-r--r-- | rules/base.lists.part | 2 | ||||
-rw-r--r-- | rules/base.xml.in | 7 | ||||
-rw-r--r-- | symbols/inet | 23 |
3 files changed, 3 insertions, 29 deletions
diff --git a/rules/base.lists.part b/rules/base.lists.part index 387599ec..907dfac2 100644 --- a/rules/base.lists.part +++ b/rules/base.lists.part @@ -56,7 +56,7 @@ oretec \ presario propeller \ qtronix \ - rapidaccess rapidaccess2 rapidaccess2a thinkpad thinkpad60 \ + rapidaccess rapidaccess2 thinkpad thinkpad60 \ samsung4500 samsung4510 \ scorpius silvercrest \ sk1300 sk2500 sk6200 sk7100 sp_inet \ diff --git a/rules/base.xml.in b/rules/base.xml.in index 31b77277..1747393b 100644 --- a/rules/base.xml.in +++ b/rules/base.xml.in @@ -576,13 +576,6 @@ </model> <model> <configItem> - <name>rapidaccess2a</name> - <_description>IBM Rapid Access II (alternate option)</_description> - <vendor>IBM</vendor> - </configItem> - </model> - <model> - <configItem> <name>thinkpad</name> <_description>IBM ThinkPad 560Z/600/600E/A22E</_description> <vendor>IBM</vendor> diff --git a/symbols/inet b/symbols/inet index 66c4d23d..20b828c9 100644 --- a/symbols/inet +++ b/symbols/inet @@ -198,7 +198,6 @@ xkb_symbols "a4_rfkb23" { include "inet(media_common)" key <I21> { [ XF86Calculator ] }; key <I32> { [ XF86HomePage ] }; - key <I32> { [ XF86WWW ] }; key <I5F> { [ XF86Sleep ] }; key <I65> { [ XF86Search ] }; key <I66> { [ XF86Favorites ] }; @@ -1231,25 +1230,6 @@ xkb_symbols "rapidaccess2" { key <I30> { [ XF86MyComputer ] }; key <I32> { [ XF86VendorHome ] }; key <I5F> { [ XF86Standby ] }; -}; - -// IBM Rapid Access II (alternate option) -partial alphanumeric_keys -xkb_symbols "rapidaccess2a" { - key <I12> { [ XF86AudioNext ] }; - key <I17> { [ XF86Favorites ] }; - key <I1E> { [ XF86AudioMute ] }; - key <I20> { [ XF86AudioStop ] }; - key <I21> { [ XF86AudioLowerVolume ] }; - key <I22> { [ XF86AudioPlay, XF86AudioPause ] }; - key <I23> { [ XF86AudioRaiseVolume ] }; - key <I24> { [ XF86AudioPrev ] }; - key <I25> { [ XF86WWW ] }; - key <I26> { [ XF86Shop ] }; - key <I2E> { [ Help ] }; - key <I30> { [ XF86Option ] }; - key <I32> { [ XF86VendorHome ] }; - key <I5F> { [ XF86Standby ] }; key <MENU> { [ Menu ] }; }; @@ -2054,7 +2034,8 @@ xkb_symbols "sp_inet" { }; // Apple keyboards (macbooks, powerbooks, powermac G5, etc) -partial xkb_symbols "apple" { +partial alphanumeric_keys +xkb_symbols "apple" { // Really brightness up/down key <II65> { [ XF86BrightnessAdjust ] }; key <I54> { [ XF86BrightnessAdjust ] }; |