xserver: Branch 'master'

[Eric Anholt]

 hw/xfree86/os-support/bsd/bsd_bell.c |    5 +++++
 1 files changed, 5 insertions(+)

New commits:
diff-tree 4e6e4baead6c565363abbcd9e06cc685be121596 (from 5e946dd853a4ebc2722ae023429ce5797de3d7a6)
Author: Eric Anholt <eric at anholt.net>
Date:   Tue Nov 7 13:13:53 2006 -0800

    Fix build on FreeBSD after input-hotplug.

diff --git a/hw/xfree86/os-support/bsd/bsd_bell.c b/hw/xfree86/os-support/bsd/bsd_bell.c
index 60c2ffc..b7a0c48 100644
--- a/hw/xfree86/os-support/bsd/bsd_bell.c
+++ b/hw/xfree86/os-support/bsd/bsd_bell.c
@@ -27,10 +27,15 @@
 #include <xorg-config.h>
 #endif
 
+#if defined (SYSCONS_SUPPORT) || defined (PCVT_SUPPORT)
+#include <sys/kbio.h>
+#endif
+
 #include <termios.h>
 
 #include "xf86.h"
 #include "xf86Priv.h"
+#include "xf86_OSlib.h"
 
 #ifdef WSCONS_SUPPORT
 #define KBD_FD(i) ((i).kbdFd != -1 ? (i).kbdFd : (i).consoleFd)