Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 24937
b: refs/heads/master
c: a536093
h: refs/heads/master
i:
  24935: 5b3aa40
v: v3
  • Loading branch information
Antonino A. Daplas authored and Linus Torvalds committed Mar 31, 2006
1 parent 69de51f commit 5a16432
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 2cbbb3b59c3ccdc55ad0c924fb49e09a962bb517
refs/heads/master: a536093a2f07007aa572e922752b7491b9ea8ff2
2 changes: 1 addition & 1 deletion trunk/drivers/video/cfbimgblt.c
Original file line number Diff line number Diff line change
Expand Up @@ -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? */
Expand Down
2 changes: 0 additions & 2 deletions trunk/include/linux/fb.h
Original file line number Diff line number Diff line change
Expand Up @@ -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

/*
Expand Down

0 comments on commit 5a16432

Please sign in to comment.