diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2016-08-23 08:16:14 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2016-08-23 08:16:14 +0200 |
| commit | 40663b773f7a0d85f769183b4ddfc9f90728fe11 (patch) | |
| tree | 079d23767e9f95ac4c4fbb1e978feaf8de276f89 | |
| parent | 55f569c1a2dfd5737a42fcd4e5dbcd461c0f2d98 (diff) | |
| parent | 3222f9a9b7b45c9204135ed3d1847aec9fdc525e (diff) | |
| download | kernel-40663b773f7a0d85f769183b4ddfc9f90728fe11.tar.gz kernel-40663b773f7a0d85f769183b4ddfc9f90728fe11.tar.xz kernel-40663b773f7a0d85f769183b4ddfc9f90728fe11.zip | |
Merge remote-tracking branch 'origin/master'
| -rw-r--r-- | silence-fbcon-logo.patch | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/silence-fbcon-logo.patch b/silence-fbcon-logo.patch index 9569d2a5b..b8f099679 100644 --- a/silence-fbcon-logo.patch +++ b/silence-fbcon-logo.patch @@ -1,3 +1,4 @@ +From a8a15723637c6dfbd5042b5c3453d31f5815f044 Mon Sep 17 00:00:00 2001 From: "kernel-team@fedoraproject.org" <kernel-team@fedoraproject.org> Date: Thu, 29 Jul 2010 16:46:31 -0700 Subject: [PATCH] silence fbcon logo @@ -5,11 +6,11 @@ Subject: [PATCH] silence fbcon logo Bugzilla: N/A Upstream-status: Fedora mustard --- - drivers/video/console/fbcon.c | 24 +++++++++++++++++------- - 1 file changed, 17 insertions(+), 7 deletions(-) + drivers/video/console/fbcon.c | 26 +++++++++++++++++++------- + 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c -index 658c34bb9076..25ab00980e4c 100644 +index afd3301ac40c..2e08ba0ade3e 100644 --- a/drivers/video/console/fbcon.c +++ b/drivers/video/console/fbcon.c @@ -634,13 +634,15 @@ static void fbcon_prepare_logo(struct vc_data *vc, struct fb_info *info, @@ -35,10 +36,12 @@ index 658c34bb9076..25ab00980e4c 100644 } } #endif /* MODULE */ -@@ -3621,6 +3623,14 @@ static int __init fb_console_init(void) - return 0; - } +@@ -3654,6 +3656,16 @@ static void __exit fb_console_exit(void) + + module_exit(fb_console_exit); ++#else ++ +static int __init quiet_logo(char *str) +{ + logo_shown = FBCON_LOGO_DONTSHOW; @@ -47,6 +50,9 @@ index 658c34bb9076..25ab00980e4c 100644 + +early_param("quiet", quiet_logo); + - fs_initcall(fb_console_init); + #endif - #ifdef MODULE + MODULE_LICENSE("GPL"); +-- +2.7.4 + |