From 221fadfc8f58d49f057ff7aa977f0fc25c940d6d Mon Sep 17 00:00:00 2001
From: "Antonino A. Daplas" <adaplas@gmail.com>
Date: Tue, 8 Nov 2005 21:39:17 -0800
Subject: [PATCH] --- yaml --- r: 13478 b: refs/heads/master c:
 81d3e147ec9ffc6ef04b5f05afa4bef22487b32b h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/video/cfbimgblt.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 392d4e7fd8e5..a2a30ee1fb4e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 120ddb41f18c2d41702af561f4acfbcbd8d6fb46
+refs/heads/master: 81d3e147ec9ffc6ef04b5f05afa4bef22487b32b
diff --git a/trunk/drivers/video/cfbimgblt.c b/trunk/drivers/video/cfbimgblt.c
index da664cea7eca..a7770c4f17d0 100644
--- a/trunk/drivers/video/cfbimgblt.c
+++ b/trunk/drivers/video/cfbimgblt.c
@@ -80,10 +80,12 @@ static u32 cfb_tab32[] = {
 #define LEFT_POS(bpp)          (32 - bpp)
 #define SHIFT_HIGH(val, bits)  ((val) >> (bits))
 #define SHIFT_LOW(val, bits)   ((val) << (bits))
+#define BIT_NR(b)              (7 - (b))
 #else
 #define LEFT_POS(bpp)          (0)
 #define SHIFT_HIGH(val, bits)  ((val) << (bits))
 #define SHIFT_LOW(val, bits)   ((val) >> (bits))
+#define BIT_NR(b)              (b)
 #endif
 
 static inline void color_imageblit(const struct fb_image *image, 
@@ -177,7 +179,7 @@ static inline void slow_imageblit(const struct fb_image *image, struct fb_info *
 
 		while (j--) {
 			l--;
-			color = (*s & (1 << l)) ? fgcolor : bgcolor;
+			color = (*s & 1 << (BIT_NR(l))) ? fgcolor : bgcolor;
 			color <<= LEFT_POS(bpp);
 			val |= SHIFT_HIGH(color, shift);