SOURCES (LINUX_2_6): bootsplash-3.1.6-2.6.13.diff - fix

[areq]

Author: areq                         Date: Sun Sep 11 15:27:53 2005 GMT
Module: SOURCES                       Tag: LINUX_2_6
---- Log message:
- fix

---- Files affected:
SOURCES:
   bootsplash-3.1.6-2.6.13.diff (1.1 -> 1.1.2.1) 

---- Diffs:

================================================================
Index: SOURCES/bootsplash-3.1.6-2.6.13.diff
diff -u SOURCES/bootsplash-3.1.6-2.6.13.diff:1.1 SOURCES/bootsplash-3.1.6-2.6.13.diff:1.1.2.1
--- SOURCES/bootsplash-3.1.6-2.6.13.diff:1.1	Sun Sep 11 13:53:59 2005
+++ SOURCES/bootsplash-3.1.6-2.6.13.diff	Sun Sep 11 17:27:48 2005
@@ -2513,21 +2513,21 @@
  	if (attribute) {
  		buf = kmalloc(cellsize, GFP_KERNEL);
  		if (!buf)
-@@ -203,6 +227,13 @@
+@@ -202,6 +226,13 @@
  	unsigned int bs = info->var.yres - bh;
  	struct fb_fillrect region;
  
 +#ifdef CONFIG_BOOTSPLASH
-+	if (info->splash_data) {
-+		splash_clear_margins(info->splash_data, vc, info, bottom_only);
-+		return;
-+	}
++       if (info->splash_data) {
++               splash_clear_margins(info->splash_data, vc, info, bottom_only);
++               return;
++       }
 +#endif
 +
- 	region.color = attr_bgcol_ec(bgshift, vc);
+ 	region.color = 0;
  	region.rop = ROP_COPY;
  
-@@ -368,6 +399,13 @@
+@@ -367,6 +398,13 @@
  	cursor.image.depth = 1;
  	cursor.rop = ROP_XOR;
  
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/bootsplash-3.1.6-2.6.13.diff?r1=1.1&r2=1.1.2.1&f=u