xserver: Branch 'master'

[Keith Packard]

 hw/xfree86/common/xf86Helper.c |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 9df4fb0adf66fb82f0c007897d79af0f54a6dad9
Author: Adam Jackson <ajax at redhat.com>
Date:   Mon Sep 27 17:06:46 2010 -0400

    xfree86: Add 18bpp support
    
    Signed-off-by: Adam Jackson <ajax at redhat.com>
    Reviewed-by: Keith Packard <keithp at keithp.com>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/hw/xfree86/common/xf86Helper.c b/hw/xfree86/common/xf86Helper.c
index 97e5aec..edc8e47 100644
--- a/hw/xfree86/common/xf86Helper.c
+++ b/hw/xfree86/common/xf86Helper.c
@@ -776,6 +776,9 @@ xf86SetWeight(ScrnInfoPtr scrp, rgb weight, rgb mask)
 	    scrp->weight.red = scrp->weight.blue = 5;
 	    scrp->weight.green = 6;
 	    break;
+	case 18:
+	    scrp->weight.red = scrp->weight.green = scrp->weight.blue = 6;
+	    break;
 	case 24:
 	    scrp->weight.red = scrp->weight.green = scrp->weight.blue = 8;
 	    break;