@@ -, +, @@ 
---
 config/x11-input.fdi |    9 ++-------
 1 files changed, 2 insertions(+), 7 deletions(-)
--- a/config/x11-input.fdi	
+++ a/config/x11-input.fdi	
@@ -10,18 +10,13 @@ 
       </match>
     </match>
 
-    <match key="info.capabilities" contains="input.keys">
+    <match key="info.capabilities" contains="input.keyboard">
       <merge key="input.xkb.rules" type="string">base</merge>
 
       <!-- If we're using Linux, we use evdev by default (falling back to
            keyboard otherwise). -->
-      <merge key="input.x11_driver" type="string">keyboard</merge>
+      <merge key="input.x11_driver" type="string">kbd</merge>
       <merge key="input.xkb.model" type="string">pc105</merge>
-      <match key="/org/freedesktop/Hal/devices/computer:system.kernel.name"
-             string="Linux">
-        <merge key="input.x11_driver" type="string">evdev</merge>
-        <merge key="input.xkb.model" type="string">evdev</merge>
-      </match>
 
       <merge key="input.xkb.layout" type="string">us</merge>
 
--