diff options
Diffstat (limited to 'target/linux/s3c24xx/patches-2.6.30')
3 files changed, 18 insertions, 23 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); } diff --git a/target/linux/s3c24xx/patches-2.6.30/031-add-openwrt-logo.patch b/target/linux/s3c24xx/patches-2.6.30/031-add-openwrt-logo.patch index 87f62fd238..3e1a59c847 100644 --- a/target/linux/s3c24xx/patches-2.6.30/031-add-openwrt-logo.patch +++ b/target/linux/s3c24xx/patches-2.6.30/031-add-openwrt-logo.patch @@ -1,7 +1,6 @@ -diff -ruN linux-2.6.29.orig/drivers/video/logo/Kconfig linux-2.6.29/drivers/video/logo/Kconfig ---- linux-2.6.29.orig/drivers/video/logo/Kconfig 2009-05-14 22:21:12.000000000 +0200 -+++ linux-2.6.29/drivers/video/logo/Kconfig 2009-05-14 22:28:50.000000000 +0200 -@@ -82,4 +82,8 @@ +--- a/drivers/video/logo/Kconfig ++++ b/drivers/video/logo/Kconfig +@@ -82,4 +82,8 @@ config LOGO_M32R_CLUT224 depends on M32R default y @@ -10,10 +9,9 @@ diff -ruN linux-2.6.29.orig/drivers/video/logo/Kconfig linux-2.6.29/drivers/vide + default y + endif # LOGO -diff -ruN linux-2.6.29.orig/drivers/video/logo/logo.c linux-2.6.29/drivers/video/logo/logo.c ---- linux-2.6.29.orig/drivers/video/logo/logo.c 2009-05-14 22:21:12.000000000 +0200 -+++ linux-2.6.29/drivers/video/logo/logo.c 2009-05-14 22:37:05.000000000 +0200 -@@ -35,6 +35,7 @@ +--- a/drivers/video/logo/logo.c ++++ b/drivers/video/logo/logo.c +@@ -35,6 +35,7 @@ extern const struct linux_logo logo_supe extern const struct linux_logo logo_superh_vga16; extern const struct linux_logo logo_superh_clut224; extern const struct linux_logo logo_m32r_clut224; @@ -21,7 +19,7 @@ diff -ruN linux-2.6.29.orig/drivers/video/logo/logo.c linux-2.6.29/drivers/video static int nologo; module_param(nologo, bool, 0); -@@ -115,6 +116,10 @@ +@@ -115,6 +116,10 @@ const struct linux_logo * __init_refok f /* M32R Linux logo */ logo = &logo_m32r_clut224; #endif @@ -32,9 +30,8 @@ diff -ruN linux-2.6.29.orig/drivers/video/logo/logo.c linux-2.6.29/drivers/video } return logo; } -diff -ruN linux-2.6.29.orig/drivers/video/logo/logo_openwrt_clut224.ppm linux-2.6.29/drivers/video/logo/logo_openwrt_clut224.ppm ---- linux-2.6.29.orig/drivers/video/logo/logo_openwrt_clut224.ppm 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.29/drivers/video/logo/logo_openwrt_clut224.ppm 2009-05-15 09:54:13.000000000 +0200 +--- /dev/null ++++ b/drivers/video/logo/logo_openwrt_clut224.ppm @@ -0,0 +1,38403 @@ +P3 +480 480 @@ -38439,10 +38436,9 @@ diff -ruN linux-2.6.29.orig/drivers/video/logo/logo_openwrt_clut224.ppm linux-2. +0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -diff -ruN linux-2.6.29.orig/drivers/video/logo/Makefile linux-2.6.29/drivers/video/logo/Makefile ---- linux-2.6.29.orig/drivers/video/logo/Makefile 2009-05-14 22:21:12.000000000 +0200 -+++ linux-2.6.29/drivers/video/logo/Makefile 2009-05-14 22:35:42.000000000 +0200 -@@ -15,6 +15,7 @@ +--- a/drivers/video/logo/Makefile ++++ b/drivers/video/logo/Makefile +@@ -15,6 +15,7 @@ obj-$(CONFIG_LOGO_SUPERH_MONO) += logo_ obj-$(CONFIG_LOGO_SUPERH_VGA16) += logo_superh_vga16.o obj-$(CONFIG_LOGO_SUPERH_CLUT224) += logo_superh_clut224.o obj-$(CONFIG_LOGO_M32R_CLUT224) += logo_m32r_clut224.o diff --git a/target/linux/s3c24xx/patches-2.6.30/040-rename-serialdevs.patch b/target/linux/s3c24xx/patches-2.6.30/040-rename-serialdevs.patch index 3e6fdbea92..4176dbc87f 100644 --- a/target/linux/s3c24xx/patches-2.6.30/040-rename-serialdevs.patch +++ b/target/linux/s3c24xx/patches-2.6.30/040-rename-serialdevs.patch @@ -1,6 +1,6 @@ --- a/drivers/serial/samsung.c +++ b/drivers/serial/samsung.c -@@ -882,7 +882,7 @@ static struct uart_ops s3c24xx_serial_op +@@ -878,7 +878,7 @@ static struct uart_ops s3c24xx_serial_op static struct uart_driver s3c24xx_uart_drv = { .owner = THIS_MODULE, |