xserver: Branch 'master'

[Michel Daenzer]

 hw/xfree86/common/xf86Init.c |    3 ---
 1 files changed, 3 deletions(-)

New commits:
diff-tree 729fca33a417ae3dfb180caf0ea8946ef9eee1df (from 4ea6dfb984063117eef5c2f931205b1c3eb3108b)
Author: Michel Dänzer <michel at tungstengraphics.com>
Date:   Thu Dec 7 12:09:18 2006 +0100

    Revert "xfree86 DDX: Delete DDX screens in ddxGiveUp()."
    
    This reverts commit a6381e69845f58d2b3282992b1f881015190f1bc.
    
    See https://bugs.freedesktop.org/show_bug.cgi?id=9224 .

diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
index 68d69c5..ff878d5 100644
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
@@ -1119,9 +1119,6 @@ ddxGiveUp()
     DGAShutdown();
 #endif
 
-    while (xf86NumScreens)
-	xf86DeleteScreen(xf86NumScreens - 1, 0);
-
     xf86CloseConsole();
 
     xf86CloseLog();