packages (Titanium): kernel-desktop/kernel-desktop-bootsplash.patch - updat...

[shadzik]

Author: shadzik                      Date: Thu Oct 21 08:41:16 2010 GMT
Module: packages                      Tag: Titanium
---- Log message:
- updated for 2.6.36

---- Files affected:
packages/kernel-desktop:
   kernel-desktop-bootsplash.patch (1.3.2.3 -> 1.3.2.4) 

---- Diffs:

================================================================
Index: packages/kernel-desktop/kernel-desktop-bootsplash.patch
diff -u packages/kernel-desktop/kernel-desktop-bootsplash.patch:1.3.2.3 packages/kernel-desktop/kernel-desktop-bootsplash.patch:1.3.2.4
--- packages/kernel-desktop/kernel-desktop-bootsplash.patch:1.3.2.3	Mon Aug  2 11:28:27 2010
+++ packages/kernel-desktop/kernel-desktop-bootsplash.patch	Thu Oct 21 10:41:11 2010
@@ -2609,21 +2609,6 @@
  	if (vram_remap)
  		size_remap = vram_remap * 1024 * 1024;
  	if (size_remap < size_vmode)
-diff -Nur linux-2.6.27.orig/include/linux/console_struct.h linux-2.6.27/include/linux/console_struct.h
---- linux-2.6.27.orig/include/linux/console_struct.h	2009-03-10 03:29:51.307469109 +0100
-+++ linux-2.6.27/include/linux/console_struct.h	2009-03-10 03:32:23.511617015 +0100
-@@ -106,6 +106,11 @@
- 	struct vc_data **vc_display_fg;		/* [!] Ptr to var holding fg console for this display */
- 	unsigned long	vc_uni_pagedir;
- 	unsigned long	*vc_uni_pagedir_loc;  /* [!] Location of uni_pagedir variable for this console */
-+	
-+#ifdef CONFIG_BOOTSPLASH
-+        struct splash_data *vc_splash_data;
-+#endif
-+
- 	/* additional information is in vt_kern.h */
- };
- 
 --- linux-2.6.31/drivers/video/console/fbcon.c.orig	2009-09-10 00:13:59.000000000 +0200
 +++ linux-2.6.31/drivers/video/console/fbcon.c	2009-09-11 01:32:20.000000000 +0200
 @@ -81,6 +81,10 @@
@@ -2792,3 +2777,15 @@
  
  #ifdef CONFIG_SPARC
  	if (keycode == KEY_A && sparc_l1_a_state) {
+--- linux-2.6.36/include/linux/console_struct.h.orig	2010-10-20 22:30:22.000000000 +0200
++++ linux-2.6.36/include/linux/console_struct.h	2010-10-21 10:39:34.776296045 +0200
+@@ -108,6 +108,9 @@
+ 	unsigned long	*vc_uni_pagedir_loc;  /* [!] Location of uni_pagedir variable for this console */
+ 	bool vc_panic_force_write; /* when oops/panic this VC can accept forced output/blanking */
+ 	/* additional information is in vt_kern.h */
++#ifdef CONFIG_BOOTSPLASH
++	struct splash_data *vc_splash_data;
++#endif
+ };
+ 
+ struct vc {
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel-desktop/kernel-desktop-bootsplash.patch?r1=1.3.2.3&r2=1.3.2.4&f=u