From 1daeaf6d08f00f627d734c26d1449285d52b15e3 Mon Sep 17 00:00:00 2001
From: Egbert Eich <eich@suse.de>
Date: Thu, 15 Apr 2004 10:16:17 +0000
Subject: Merged changes from RELEASE-1 branch

---
 src/apm_rush.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/apm_rush.c')

diff --git a/src/apm_rush.c b/src/apm_rush.c
index 4c5161a..4e0b745 100644
--- a/src/apm_rush.c
+++ b/src/apm_rush.c
@@ -1,4 +1,4 @@
-/* $XdotOrg: xc/programs/Xserver/hw/xfree86/drivers/apm/apm_rush.c,v 1.1.4.1 2003/12/18 19:29:14 kaleb Exp $ */
+/* $XdotOrg$ */
 /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/apm_rush.c,v 1.11tsi Exp $ */
 /*
  * Copyright Loïc Grenié 1999
@@ -346,7 +346,7 @@ XFree86RushExtensionInit(ScreenPtr pScreen)
 {
     ExtensionEntry* extEntry;
 
-#ifdef XINERAMA
+#ifdef PANORAMIX
     if (!noPanoramiXExtension)
 	return;
 #endif
-- 
cgit v1.2.3