diff options
| author | Josh Boyer <jwboyer@fedoraproject.org> | 2014-08-20 13:22:24 -0400 |
|---|---|---|
| committer | Josh Boyer <jwboyer@fedoraproject.org> | 2014-08-20 13:22:24 -0400 |
| commit | 6a91557e4cd508858eca5aba5406a9109861d4de (patch) | |
| tree | c57990ccc4a28a9933db2aebba1006f46c619f44 /silence-fbcon-logo.patch | |
| parent | a99be7d4cf2fae68a0562a7687d89ee61c6b9f98 (diff) | |
| download | kernel-6a91557e4cd508858eca5aba5406a9109861d4de.tar.gz kernel-6a91557e4cd508858eca5aba5406a9109861d4de.tar.xz kernel-6a91557e4cd508858eca5aba5406a9109861d4de.zip | |
Patch file cleanup
Do a couple things here:
- Split the mega-patches into individual patches. Should help with rebasing.
- Make all patches 'git am' acceptable.
There should be no functional or actual code differences from before
Diffstat (limited to 'silence-fbcon-logo.patch')
| -rw-r--r-- | silence-fbcon-logo.patch | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/silence-fbcon-logo.patch b/silence-fbcon-logo.patch index ccb76386c..263548142 100644 --- a/silence-fbcon-logo.patch +++ b/silence-fbcon-logo.patch @@ -1,11 +1,19 @@ +From b0c75b1839a0ccf645329a0ee2b268109300c2b0 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 + Bugzilla: N/A Upstream-status: Fedora mustard +--- + drivers/video/console/fbcon.c | 24 +++++++++++++++++------- + 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c -index 1657b96..4c5c2be 100644 +index 57b1d44acbfe..31048a85713d 100644 --- a/drivers/video/console/fbcon.c +++ b/drivers/video/console/fbcon.c -@@ -631,13 +631,15 @@ static void fbcon_prepare_logo(struct vc_data *vc, struct fb_info *info, +@@ -638,13 +638,15 @@ static void fbcon_prepare_logo(struct vc_data *vc, struct fb_info *info, kfree(save); } @@ -28,7 +36,7 @@ index 1657b96..4c5c2be 100644 } } #endif /* MODULE */ -@@ -3489,6 +3491,14 @@ static int __init fb_console_init(void) +@@ -3625,6 +3627,14 @@ static int __init fb_console_init(void) return 0; } @@ -43,3 +51,6 @@ index 1657b96..4c5c2be 100644 module_init(fb_console_init); #ifdef MODULE +-- +1.9.3 + |