xserver: Branch 'master'

[Michel Daenzer]

 hw/xfree86/common/xf86Init.c |    3 +++
 1 files changed, 3 insertions(+)

New commits:
diff-tree a6381e69845f58d2b3282992b1f881015190f1bc (from b0c8558b9d9a9984c0067960392e28f5a7622b29)
Author: Michel Dänzer <michel at tungstengraphics.com>
Date:   Wed Nov 29 19:25:09 2006 +0100

    xfree86 DDX: Delete DDX screens in ddxGiveUp().
    
    This allows video drivers to clean up in the FreeScreen hook things they set up
    in the PreInit hook.

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