xserver: Branch 'master' - 2 commits

[Brian Paul]

 fb/fbcmap.c         |    2 +-
 hw/xprint/ddxInit.c |    6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

New commits:
diff-tree 0ee40c935750e25a9e178cdd70f6b2c667e79344 (from 23974f20bf0e0c2786cc75af026af5484f6dc331)
Author: Brian <brian at yutani.localnet.net>
Date:   Tue Apr 3 09:31:00 2007 -0600

    s/intead/instead/

diff --git a/fb/fbcmap.c b/fb/fbcmap.c
index a8cfb79..c29a513 100644
--- a/fb/fbcmap.c
+++ b/fb/fbcmap.c
@@ -40,7 +40,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "fb.h"
 
 #ifdef XFree86Server
-#error "You should be compiling fbcmap_mi.c intead of fbcmap.c!"
+#error "You should be compiling fbcmap_mi.c instead of fbcmap.c!"
 #endif
 
 
diff-tree 23974f20bf0e0c2786cc75af026af5484f6dc331 (from a240c039c47c0be22ea5e100692307b26d938747)
Author: Brian <brian at yutani.localnet.net>
Date:   Tue Apr 3 09:30:24 2007 -0600

    add DDXRingBell() stub to solve link problem

diff --git a/hw/xprint/ddxInit.c b/hw/xprint/ddxInit.c
index 8e7ec2e..a465c4c 100644
--- a/hw/xprint/ddxInit.c
+++ b/hw/xprint/ddxInit.c
@@ -89,6 +89,12 @@ InitOutput(
 
 }
 
+void
+DDXRingBell(int volume, int pitch, int duration)
+{
+   /* dummy func; link fails without */
+}
+
 static void
 BellProc(
     int volume,