xserver: Branch 'master'

[Alan Coopersmith]

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

New commits:
commit 60bcdd687040db76490851d4b459284ce37020e0
Author: Alan Coopersmith <alan.coopersmith at sun.com>
Date:   Fri Jan 30 21:44:08 2009 -0800

    x11-input.fdi: Add options needed to handle adding USB devices on Solaris

diff --git a/config/x11-input.fdi b/config/x11-input.fdi
index af14781..9e629cb 100644
--- a/config/x11-input.fdi
+++ b/config/x11-input.fdi
@@ -61,6 +61,13 @@
              string="Linux">
         <merge key="input.x11_driver" type="string">evdev</merge>
       </match>
+      <match key="/org/freedesktop/Hal/devices/computer:system.kernel.name"
+             string="SunOS">
+       <match key="input.device" contains="usb">
+        <merge key="input.x11_options.StreamsModule" type="string">usbms</merge>
+        <merge key="input.x11_options.Protocol" type="string">VUID</merge>
+       </match>
+      </match>
     </match>
 
     <match key="info.capabilities" contains="input.keys">
@@ -75,6 +82,13 @@
         <merge key="input.x11_driver" type="string">evdev</merge>
         <merge key="input.x11_options.XkbModel" type="string">evdev</merge>
       </match>
+      <match key="/org/freedesktop/Hal/devices/computer:system.kernel.name"
+             string="SunOS">
+       <match key="input.device" contains="usb">
+        <merge key="input.x11_options.StreamsModule" type="string">usbkbm</merge>
+        <merge key="input.x11_options.Protocol" type="string">VUID</merge>
+       </match>
+      </match>
 
       <merge key="input.x11_options.XkbLayout" type="string">us</merge>