From bf45686addeff0310960a55147f6a54d2dc316f7 Mon Sep 17 00:00:00 2001
From: Pieter Grimmerink <p.grimmerink@inepro.com>
Date: Fri, 13 Nov 2009 10:28:54 +0100
Subject: [PATCH] --- yaml --- r: 172557 b: refs/heads/master c:
 049ad833b1e52f6edeb675c744547167bf76ab2c h: refs/heads/master i:   172555:
 8518fa562f079c4abaf1d9cbf3905389f3958285 v: v3

---
 [refs]                                       | 2 +-
 trunk/arch/arm/mach-pxa/include/mach/pxafb.h | 3 ++-
 trunk/drivers/video/pxafb.c                  | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 2c013c5e3508..243b8d9583db 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 448ac479768d6c242338ecf13569dc297f8908ce
+refs/heads/master: 049ad833b1e52f6edeb675c744547167bf76ab2c
diff --git a/trunk/arch/arm/mach-pxa/include/mach/pxafb.h b/trunk/arch/arm/mach-pxa/include/mach/pxafb.h
index f73061c90b5e..160ec83f51a6 100644
--- a/trunk/arch/arm/mach-pxa/include/mach/pxafb.h
+++ b/trunk/arch/arm/mach-pxa/include/mach/pxafb.h
@@ -76,7 +76,8 @@ struct pxafb_mode_info {
 	u_char		bpp;
 	u_int		cmap_greyscale:1,
 			depth:8,
-			unused:23;
+			transparency:1,
+			unused:22;
 
 	/* Parallel Mode Timing */
 	u_char		hsync_len;
diff --git a/trunk/drivers/video/pxafb.c b/trunk/drivers/video/pxafb.c
index 33a6aacfcbe3..f58a3aae6ea6 100644
--- a/trunk/drivers/video/pxafb.c
+++ b/trunk/drivers/video/pxafb.c
@@ -398,6 +398,7 @@ static void pxafb_setmode(struct fb_var_screeninfo *var,
 	var->lower_margin	= mode->lower_margin;
 	var->sync		= mode->sync;
 	var->grayscale		= mode->cmap_greyscale;
+	var->transp.length	= mode->transparency;
 
 	/* set the initial RGBA bitfields */
 	pxafb_set_pixfmt(var, mode->depth);