xserver: Branch 'master'

[Alan Coopersmith]

 hw/kdrive/ephyr/ephyrinit.c |    4 ++++
 1 files changed, 4 insertions(+)

New commits:
diff-tree c5741438a3a171f493e9da32a6b39f73403f6993 (from 59961e47df4ea621a6713a8c7d060555f8746c3a)
Author: Alan Coopersmith <alan.coopersmith at sun.com>
Date:   Fri Aug 10 16:13:55 2007 -0700

    Only use evdev drivers in Xephyr #ifdef linux

diff --git a/hw/kdrive/ephyr/ephyrinit.c b/hw/kdrive/ephyr/ephyrinit.c
index 56b4f16..a76da03 100644
--- a/hw/kdrive/ephyr/ephyrinit.c
+++ b/hw/kdrive/ephyr/ephyrinit.c
@@ -57,9 +57,13 @@ InitInput (int argc, char **argv)
   KdPointerInfo *pi;
         
   KdAddKeyboardDriver(&EphyrKeyboardDriver);
+#ifdef linux
   KdAddKeyboardDriver(&LinuxEvdevKeyboardDriver);
+#endif
   KdAddPointerDriver(&EphyrMouseDriver);
+#ifdef linux
   KdAddPointerDriver(&LinuxEvdevMouseDriver);
+#endif
 
   if (!kdHasKbd) {
     ki = KdNewKeyboard();