summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Jackson <ajax@redhat.com>2007-11-08 17:25:36 -0500
committerAdam Jackson <ajax@redhat.com>2007-11-14 14:46:22 -0500
commitcecac794451b793871f297b91a11d3b52eeb6d1b (patch)
treedd73aad9c53d25f4c5e231cd6ef4900f5b60c593
parentf7dd0c72b8f861f4d5443a43d1013e3fe3db43ca (diff)
Don't sleep(1) at server exit.
-rw-r--r--hw/xfree86/common/xf86Init.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
index bf577e6ad..d4f01d311 100644
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
@@ -1307,7 +1307,7 @@ AbortDDX()
/*
* try to restore the original video state
*/
-#ifdef HAS_USL_VTS
+#if defined(HAS_USL_VTS) && !defined(linux)
/* Need the sleep when starting X from within another X session */
sleep(1);
#endif