From 5a16432a154d1aa374e8b43a4400be9a07b92baf Mon Sep 17 00:00:00 2001 From: "Antonino A. Daplas" Date: Fri, 31 Mar 2006 02:31:54 -0800 Subject: [PATCH] --- yaml --- r: 24937 b: refs/heads/master c: a536093a2f07007aa572e922752b7491b9ea8ff2 h: refs/heads/master i: 24935: 5b3aa403b88f1f9d0b8ca5839623dfa86d2911b9 v: v3 --- [refs] | 2 +- trunk/drivers/video/cfbimgblt.c | 2 +- trunk/include/linux/fb.h | 2 -- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index d9febdf44944..c6cde2851507 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2cbbb3b59c3ccdc55ad0c924fb49e09a962bb517 +refs/heads/master: a536093a2f07007aa572e922752b7491b9ea8ff2 diff --git a/trunk/drivers/video/cfbimgblt.c b/trunk/drivers/video/cfbimgblt.c index 910e2338a27e..8ba6152db2fd 100644 --- a/trunk/drivers/video/cfbimgblt.c +++ b/trunk/drivers/video/cfbimgblt.c @@ -169,7 +169,7 @@ static inline void slow_imageblit(const struct fb_image *image, struct fb_info * while (j--) { l--; - color = (*s & 1 << (FB_BIT_NR(l))) ? fgcolor : bgcolor; + color = (*s & (1 << l)) ? fgcolor : bgcolor; val |= FB_SHIFT_HIGH(color, shift); /* Did the bitshift spill bits to the next long? */ diff --git a/trunk/include/linux/fb.h b/trunk/include/linux/fb.h index d03fadfcafe3..315d89740ddf 100644 --- a/trunk/include/linux/fb.h +++ b/trunk/include/linux/fb.h @@ -839,12 +839,10 @@ struct fb_info { #define FB_LEFT_POS(bpp) (32 - bpp) #define FB_SHIFT_HIGH(val, bits) ((val) >> (bits)) #define FB_SHIFT_LOW(val, bits) ((val) << (bits)) -#define FB_BIT_NR(b) (7 - (b)) #else #define FB_LEFT_POS(bpp) (0) #define FB_SHIFT_HIGH(val, bits) ((val) << (bits)) #define FB_SHIFT_LOW(val, bits) ((val) >> (bits)) -#define FB_BIT_NR(b) (b) #endif /*