diff options
| author | Hirokazu Takata <takata@linux-m32r.org> | 2005-07-08 04:59:32 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-08 05:24:11 +0400 |
| commit | 316240f66a64c95e373d52dc401d882d77a594ee (patch) | |
| tree | 1d04cba74cd2455bb6b886ed4b85b7bbb73b8544 /drivers/video/logo/logo.c | |
| parent | e34ac862ee6644378bfe6ea65c2e0dda4545513d (diff) | |
| download | linux-316240f66a64c95e373d52dc401d882d77a594ee.tar.xz | |
[PATCH] m32r: framebuffer device support
This patch is for supporting Epson s1d13xxx framebuffer device for m32r. #
Sorry, a little bigger.
The Epson s1d13806 is already supported by 2.6.12 kernel, and its driver is
placed as drivers/video/s1d13xxxfb.c.
For the m32r, a header file include/asm-m32r/s1d13806.h was prepared for
several m32r target platforms. It was originally generated by an Epson
tool S1D13806CFG.EXE, and modified manually for the m32r platforms.
Signed-off-by: Hayato Fujiwara <fujiwara@linux-m32r.org>
Signed-off-by: Hirokazu Takata <takata@linux-m32r.org>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/video/logo/logo.c')
| -rw-r--r-- | drivers/video/logo/logo.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/video/logo/logo.c b/drivers/video/logo/logo.c index 77b622075001..788fa812c871 100644 --- a/drivers/video/logo/logo.c +++ b/drivers/video/logo/logo.c @@ -33,6 +33,7 @@ extern const struct linux_logo logo_sun_clut224; 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) @@ -97,6 +98,10 @@ const struct linux_logo *fb_find_logo(int depth) /* SuperH Linux logo */ logo = &logo_superh_clut224; #endif +#ifdef CONFIG_LOGO_M32R_CLUT224 + /* M32R Linux logo */ + logo = &logo_m32r_clut224; +#endif } return logo; } |