xserver: Branch 'master'

[Alan Coopersmith]

 config/x11-input.fdi |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit d63ea510138c8b6de66184c78cda39ed9981fc1f
Author: Alan Coopersmith <alan.coopersmith at sun.com>
Date:   Wed Nov 5 14:52:29 2008 -0800

    Non-Linux OS'es should default to kbd driver, not now-dead keyboard driver

diff --git a/config/x11-input.fdi b/config/x11-input.fdi
index 9c3f9fb..af14781 100644
--- a/config/x11-input.fdi
+++ b/config/x11-input.fdi
@@ -67,8 +67,8 @@
       <merge key="input.x11_options.XkbRules" 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>
+           kbd otherwise). -->
+      <merge key="input.x11_driver" type="string">kbd</merge>
       <merge key="input.x11_options.XkbModel" type="string">pc105</merge>
       <match key="/org/freedesktop/Hal/devices/computer:system.kernel.name"
              string="Linux">