xserver: Branch 'master'

[Matthew Allum]

 hw/kdrive/fbdev/fbdev.c  |    2 ++
 hw/kdrive/fbdev/fbinit.c |    2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
diff-tree 69d5becce4ca2cfc8f8de53672ed54a47de62164 (from fd609956f27d76ee76ac8623787f0fc8633a5546)
Author: Matthew Allum <mallum at openedhand.com>
Date:   Thu Aug 31 17:30:24 2006 +0100

    Fix previous commit breaking other kdrives pulling in fbdev.a

diff --git a/hw/kdrive/fbdev/fbdev.c b/hw/kdrive/fbdev/fbdev.c
index 904d5f3..20bf758 100644
--- a/hw/kdrive/fbdev/fbdev.c
+++ b/hw/kdrive/fbdev/fbdev.c
@@ -33,6 +33,8 @@
 
 extern int KdTsPhyScreen;
 
+char *fbdevDevicePath = NULL;
+
 Bool
 fbdevInitialize (KdCardInfo *card, FbdevPriv *priv)
 {
diff --git a/hw/kdrive/fbdev/fbinit.c b/hw/kdrive/fbdev/fbinit.c
index 1a7e4bf..ee37327 100644
--- a/hw/kdrive/fbdev/fbinit.c
+++ b/hw/kdrive/fbdev/fbinit.c
@@ -77,7 +77,7 @@ ddxProcessArgument (int argc, char **arg
   return KdProcessArgument (argc, argv, i);
 }
 
-char           *fbdevDevicePath = NULL;
+
 KdCardFuncs	fbdevFuncs = {
     fbdevCardInit,	    /* cardinit */
     fbdevScreenInit,	    /* scrinit */