diff options
author | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-01-28 11:54:20 +0000 |
---|---|---|
committer | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-01-28 11:54:20 +0000 |
commit | 414e59d258bd0298c6dc0fe6a4ffff321d1afa21 (patch) | |
tree | 8b96a9f12e9ec3b6fa87a666e0f16fc920a9fe81 /target/linux/xburst/patches-2.6.32/900-add-openwrt-logo.patch | |
parent | d923b1457ec8a850683b11d911a19018b794ac8a (diff) |
kernel: update to 2.6.32.6
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@19358 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/xburst/patches-2.6.32/900-add-openwrt-logo.patch')
-rw-r--r-- | target/linux/xburst/patches-2.6.32/900-add-openwrt-logo.patch | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/target/linux/xburst/patches-2.6.32/900-add-openwrt-logo.patch b/target/linux/xburst/patches-2.6.32/900-add-openwrt-logo.patch index 31ca2b5aa..e0ae84628 100644 --- a/target/linux/xburst/patches-2.6.32/900-add-openwrt-logo.patch +++ b/target/linux/xburst/patches-2.6.32/900-add-openwrt-logo.patch @@ -10,8 +10,6 @@ Subject: [PATCH] /opt/Projects/openwrt/target/linux/xburst/patches-2.6.31/900-ad include/linux/linux_logo.h | 1 + 4 files changed, 10 insertions(+), 0 deletions(-) -diff --git a/drivers/video/logo/Kconfig b/drivers/video/logo/Kconfig -index 39ac49e..03da067 100644 --- a/drivers/video/logo/Kconfig +++ b/drivers/video/logo/Kconfig @@ -82,4 +82,8 @@ config LOGO_M32R_CLUT224 @@ -23,11 +21,9 @@ index 39ac49e..03da067 100644 + default y + endif # LOGO -diff --git a/drivers/video/logo/Makefile b/drivers/video/logo/Makefile -index 3b43781..cbed3a5 100644 --- a/drivers/video/logo/Makefile +++ b/drivers/video/logo/Makefile -@@ -15,6 +15,7 @@ obj-$(CONFIG_LOGO_SUPERH_MONO) += logo_superh_mono.o +@@ -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 @@ -35,11 +31,9 @@ index 3b43781..cbed3a5 100644 obj-$(CONFIG_SPU_BASE) += logo_spe_clut224.o -diff --git a/drivers/video/logo/logo.c b/drivers/video/logo/logo.c -index ea7a8cc..7208830 100644 --- a/drivers/video/logo/logo.c +++ b/drivers/video/logo/logo.c -@@ -100,6 +100,10 @@ const struct linux_logo * __init_refok fb_find_logo(int depth) +@@ -100,6 +100,10 @@ const struct linux_logo * __init_refok f /* M32R Linux logo */ logo = &logo_m32r_clut224; #endif @@ -50,11 +44,9 @@ index ea7a8cc..7208830 100644 } return logo; } -diff --git a/include/linux/linux_logo.h b/include/linux/linux_logo.h -index ca5bd91..67166f3 100644 --- a/include/linux/linux_logo.h +++ b/include/linux/linux_logo.h -@@ -47,6 +47,7 @@ extern const struct linux_logo logo_superh_vga16; +@@ -47,6 +47,7 @@ extern const struct linux_logo logo_supe extern const struct linux_logo logo_superh_clut224; extern const struct linux_logo logo_m32r_clut224; extern const struct linux_logo logo_spe_clut224; @@ -9734,4 +9726,3 @@ index ca5bd91..67166f3 100644 +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 - |