[Linuxconsole-commit]CVS: ruby/linux/drivers/video cfbimgblt.c,1.15,1.16 cfbfillrect.c,1.11,NONE

[James S. <jsi...@us...>]

Update of /cvsroot/linuxconsole/ruby/linux/drivers/video
In directory usw-pr-cvs1:/tmp/cvs-serv13236/linux/drivers/video

Modified Files:
	cfbimgblt.c 
Removed Files:
	cfbfillrect.c 
Log Message:
Synced to 2.5.22

Index: cfbimgblt.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/video/cfbimgblt.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- cfbimgblt.c	15 Jun 2002 19:17:10 -0000	1.15
+++ cfbimgblt.c	18 Jun 2002 18:51:55 -0000	1.16
@@ -98,7 +98,7 @@
 				end_mask = 0;
 		
 				for (k = ppw; k > 0; k--) {	
-					if (test_bit(l, src))
+					if (test_bit(l, (unsigned long *) src))
 						end_mask |= (tmp >> (p->var.bits_per_pixel*(k-1)));
 					l--;
 					if (l < 0) { l = 7; src++; }
@@ -110,7 +110,7 @@
 			if (n) {
 				end_mask = 0;	
 				for (j = n; j > 0; j--) {
-					if (test_bit(l, src))
+					if (test_bit(l, (unsigned long *) src))
 						end_mask |= (tmp >> (p->var.bits_per_pixel*(j-1)));
 					l--;
 					if (l < 0) { l = 7; src++; }

--- cfbfillrect.c DELETED ---