Update of /cvsroot/gc-linux/linux/drivers/video/logo
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26847/drivers/video/logo
Modified Files:
Kconfig Makefile logo.c
Log Message:
Merge 2.6.13
Index: Kconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/video/logo/Kconfig,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Kconfig 23 Jun 2005 20:02:21 -0000 1.3
+++ Kconfig 29 Aug 2005 19:50:20 -0000 1.4
@@ -68,5 +68,10 @@
depends on LOGO && SUPERH
default y
+config LOGO_M32R_CLUT224
+ bool "224-color M32R Linux logo"
+ depends on LOGO && M32R
+ default y
+
endmenu
Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/video/logo/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile 23 Jun 2005 20:02:21 -0000 1.2
+++ Makefile 29 Aug 2005 19:50:20 -0000 1.3
@@ -13,6 +13,7 @@
obj-$(CONFIG_LOGO_SUPERH_MONO) += logo_superh_mono.o
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
# How to generate logo's
Index: logo.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/video/logo/logo.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- logo.c 23 Jun 2005 20:02:21 -0000 1.2
+++ logo.c 29 Aug 2005 19:50:20 -0000 1.3
@@ -34,6 +34,7 @@
extern const struct linux_logo logo_superh_mono;
extern const struct linux_logo logo_superh_vga16;
extern const struct linux_logo logo_superh_clut224;
+extern const struct linux_logo logo_m32r_clut224;
const struct linux_logo *fb_find_logo(int depth)
@@ -102,6 +103,10 @@
/* SuperH Linux logo */
logo = &logo_superh_clut224;
#endif
+#ifdef CONFIG_LOGO_M32R_CLUT224
+ /* M32R Linux logo */
+ logo = &logo_m32r_clut224;
+#endif
}
return logo;
}
|
