xserver: Branch 'master'

[Adam Jackson]

 hw/xfree86/os-support/bsd/bsd_axp.c   |    4 ++--
 hw/xfree86/os-support/linux/lnx_axp.c |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 8ce4fde76fdf747fd3e00836c9c9c542e516ae9a
Author: Matt Turner <mattst88 at gmail.com>
Date:   Wed Aug 12 14:45:13 2009 -0400

    Fix build on Alpha

diff --git a/hw/xfree86/os-support/bsd/bsd_axp.c b/hw/xfree86/os-support/bsd/bsd_axp.c
index cb10a9d..77c87ce 100644
--- a/hw/xfree86/os-support/bsd/bsd_axp.c
+++ b/hw/xfree86/os-support/bsd/bsd_axp.c
@@ -36,7 +36,7 @@ static _AXP axpList[] = {
 	{"lca",LCA},
 	{"t2",T2},
 	{"tsunami",TSUNAMI},
-	{NULL,NONE}
+	{NULL,SYS_NONE}
 };
 
 axpDevice
@@ -65,7 +65,7 @@ bsdGetAXP(void)
 #endif
 	for (i=0;;i++) {
 		if (axpList[i].name == NULL)
-			return NONE;
+			return SYS_NONE;
 		if (!strcmp(sysname, axpList[i].name))
 			return axpList[i].type;
 	}
diff --git a/hw/xfree86/os-support/linux/lnx_axp.c b/hw/xfree86/os-support/linux/lnx_axp.c
index d259999..8571c04 100644
--- a/hw/xfree86/os-support/linux/lnx_axp.c
+++ b/hw/xfree86/os-support/linux/lnx_axp.c
@@ -49,7 +49,7 @@ static AXP axpList[] = {
   {"Miata",NULL,NULL,PYXIS_CIA},
   {"Ruffian",NULL,NULL,PYXIS_CIA},
   {"Nautilus",NULL,NULL,IRONGATE},
-  {NULL,NULL,NULL,NONE}
+  {NULL,NULL,NULL,SYS_NONE}
 };