diff options
| author | Imre Kaloz <kaloz@openwrt.org> | 2009-06-03 13:42:28 +0000 |
|---|---|---|
| committer | Imre Kaloz <kaloz@openwrt.org> | 2009-06-03 13:42:28 +0000 |
| commit | 0d96f5908597f25dcf2fbd1a72907e143243f35c (patch) | |
| tree | 29e1a62037306f13deffcc1f44e8d5a99a46a225 /target/linux/s3c24xx/patches-2.6.30/030-dont-override-logo-with-early-printks.patch | |
| parent | 26ee3a1aa4e39ba962ed9b46df5ceea58f37cee7 (diff) | |
| download | master-187ad058-0d96f5908597f25dcf2fbd1a72907e143243f35c.tar.gz master-187ad058-0d96f5908597f25dcf2fbd1a72907e143243f35c.tar.bz2 master-187ad058-0d96f5908597f25dcf2fbd1a72907e143243f35c.zip | |
upgrade to 2.6.30-rc8
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@16307 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/s3c24xx/patches-2.6.30/030-dont-override-logo-with-early-printks.patch')
| -rw-r--r-- | target/linux/s3c24xx/patches-2.6.30/030-dont-override-logo-with-early-printks.patch | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/target/linux/s3c24xx/patches-2.6.30/030-dont-override-logo-with-early-printks.patch b/target/linux/s3c24xx/patches-2.6.30/030-dont-override-logo-with-early-printks.patch index 3aa1a0be5a..305af188ac 100644 --- a/target/linux/s3c24xx/patches-2.6.30/030-dont-override-logo-with-early-printks.patch +++ b/target/linux/s3c24xx/patches-2.6.30/030-dont-override-logo-with-early-printks.patch @@ -1,7 +1,6 @@ -diff -ruN linux-2.6.29.orig/drivers/video/console/fbcon.c linux-2.6.29/drivers/video/console/fbcon.c ---- linux-2.6.29.orig/drivers/video/console/fbcon.c 2009-05-14 22:21:12.000000000 +0200 -+++ linux-2.6.29/drivers/video/console/fbcon.c 2009-05-15 01:45:36.000000000 +0200 -@@ -562,7 +562,7 @@ +--- a/drivers/video/console/fbcon.c ++++ b/drivers/video/console/fbcon.c +@@ -562,7 +562,7 @@ static void fbcon_prepare_logo(struct vc /* Need to make room for the logo */ struct fbcon_ops *ops = info->fbcon_par; int cnt, erase = vc->vc_video_erase_char, step; @@ -10,7 +9,7 @@ diff -ruN linux-2.6.29.orig/drivers/video/console/fbcon.c linux-2.6.29/drivers/v int logo_height; if (info->flags & FBINFO_MODULE) { -@@ -581,37 +581,18 @@ +@@ -581,37 +581,18 @@ static void fbcon_prepare_logo(struct vc q = (unsigned short *) (vc->vc_origin + vc->vc_size_row * rows); step = logo_lines * cols; @@ -60,7 +59,7 @@ diff -ruN linux-2.6.29.orig/drivers/video/console/fbcon.c linux-2.6.29/drivers/v scr_memsetw((unsigned short *) vc->vc_origin, erase, vc->vc_size_row * logo_lines); -@@ -621,16 +602,6 @@ +@@ -621,16 +602,6 @@ static void fbcon_prepare_logo(struct vc update_screen(vc); } |