xserver: Branch 'server-1.4-branch'

[Julien Cristau]

 hw/kdrive/src/kdrive.c |    6 ------
 1 file changed, 6 deletions(-)

New commits:
commit 3f8ba890762513edc7eddbbbd4bb26f908540c8d
Author: Julien Cristau <jcristau at debian.org>
Date:   Sun May 11 23:17:27 2008 +0200

    kdrive: allow disabling Composite
    
    KdInitOutput() used to enable Composite when it was disabled by default,
    but now this hack prevents ``-extension Composite'' from working.
    Remove it, as Composite is enabled by default anyway.
    (cherry picked from commit 9dfb525f6c91acab5d1a65765a046bf9ee2aa082)

diff --git a/hw/kdrive/src/kdrive.c b/hw/kdrive/src/kdrive.c
index 2bb7b53..cd4ea7d 100644
--- a/hw/kdrive/src/kdrive.c
+++ b/hw/kdrive/src/kdrive.c
@@ -1387,12 +1387,6 @@ KdInitOutput (ScreenInfo    *pScreenInfo,
     KdCardInfo	    *card;
     KdScreenInfo    *screen;
 
-#ifdef COMPOSITE
-    /* kind of a hack: we want Composite enabled, but it's disabled per
-     * default. */
-    noCompositeExtension = FALSE;
-#endif
-    
     if (!kdCardInfo)
     {
 	InitCard (0);