rpms/kernel/devel kernel.spec, 1.1340, 1.1341 linux-2.6-silence-fbcon-logo.patch, 1.1, 1.2

[Kyle McMartin]

Author: kyle

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30748

Modified Files:
	kernel.spec linux-2.6-silence-fbcon-logo.patch 
Log Message:
* Thu Feb 26 2009 Kyle McMartin <kyle at redhat.com>
- myoung points out we're not returning a value in the fbcon quiet patch.



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1340
retrieving revision 1.1341
diff -u -r1.1340 -r1.1341
--- kernel.spec	26 Feb 2009 19:25:52 -0000	1.1340
+++ kernel.spec	26 Feb 2009 22:27:37 -0000	1.1341
@@ -1760,8 +1760,14 @@
 %kernel_variant_files %{with_pae_debug} PAEdebug
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
+# plz don't put in a version string unless you're going to tag
+# and build.
+
 %changelog
-* Thu Feb 26 2009 John W. Linville <linville at redhat.com> 2.6.29-0.160.rc6.git3
+* Thu Feb 26 2009 Kyle McMartin <kyle at redhat.com>
+- myoung points out we're not returning a value in the fbcon quiet patch.
+
+* Thu Feb 26 2009 John W. Linville <linville at redhat.com>
 - Add dcbw's back-port patches to age scan results on resume
 
 * Thu Feb 26 2009 Kyle McMartin <kyle at redhat.com> 2.6.29-0.159.rc6.git3

linux-2.6-silence-fbcon-logo.patch:

Index: linux-2.6-silence-fbcon-logo.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-silence-fbcon-logo.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-silence-fbcon-logo.patch	11 Jun 2008 20:16:39 -0000	1.1
+++ linux-2.6-silence-fbcon-logo.patch	26 Feb 2009 22:27:37 -0000	1.2
@@ -1,8 +1,8 @@
 diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c
-index 97aff8d..5e230b6 100644
+index 1657b96..4c5c2be 100644
 --- a/drivers/video/console/fbcon.c
 +++ b/drivers/video/console/fbcon.c
-@@ -674,13 +674,15 @@ static void fbcon_prepare_logo(struct vc_data *vc, struct fb_info *info,
+@@ -631,13 +631,15 @@ static void fbcon_prepare_logo(struct vc_data *vc, struct fb_info *info,
  		kfree(save);
  	}
  
@@ -25,13 +25,14 @@
  	}
  }
  #endif /* MODULE */
-@@ -3604,6 +3606,13 @@ static int __init fb_console_init(void)
+@@ -3489,6 +3491,14 @@ static int __init fb_console_init(void)
  	return 0;
  }
  
 +static int __init quiet_logo(char *str)
 +{
 +	logo_shown = FBCON_LOGO_DONTSHOW;
++	return 0;
 +}
 +
 +early_param("quiet", quiet_logo);