xserver: Branch 'master'

[Juliusz Chroboczek]

 hw/kdrive/vesa/vbe.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

New commits:
diff-tree 6b2c65fdd169037c6ede250d4a8fec3d29a080ae (from 8deaaa312ad7f9b492a2ae8ad17d74650112c25c)
Author: Juliusz Chroboczek <jch at pps.jussieu.fr>
Date:   Mon Nov 6 00:30:09 2006 +0100

    Fix typo in Xvesa: incorrect reporting of DAC capabilities.

diff --git a/hw/kdrive/vesa/vbe.c b/hw/kdrive/vesa/vbe.c
index 5fbd8ab..08f0b03 100644
--- a/hw/kdrive/vesa/vbe.c
+++ b/hw/kdrive/vesa/vbe.c
@@ -101,7 +101,7 @@ VbeReportVib(Vm86InfoPtr vi, VbeInfoBloc
     }
     ErrorF(")\n");
     ErrorF("DAC is %s, controller is %sVGA compatible%s\n",
-           (vib->Capabilities[0]&1)?"fixed":"switchable",
+           (vib->Capabilities[0]&1)?"switchable":"fixed",
            (vib->Capabilities[0]&2)?"not ":"",
            (vib->Capabilities[0]&3)?", RAMDAC causes snow":"");
     ErrorF("Total memory: %lu kilobytes\n", 64L*vib->TotalMemory);