Commit c9662869 authored by Paul Mundt's avatar Paul Mundt Committed by Linus Torvalds

[PATCH] asiliantfb init fix

asiliantfb seems to have only been partially merged (the fbmem.c bits in
particular seem to have been missed entirely).  This adds them back in,
though they do seem to be present in the fbdev tree, at least they were the
last time I looked.

These are the last bit of outstanding changes I have in the LinuxSH
tree for asiliantfb, so it would be nice to get this out of the way.
Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 490cf56b
...@@ -172,6 +172,7 @@ extern int kyrofb_init(void); ...@@ -172,6 +172,7 @@ extern int kyrofb_init(void);
extern int kyrofb_setup(char*); extern int kyrofb_setup(char*);
extern int mc68x328fb_init(void); extern int mc68x328fb_init(void);
extern int mc68x328fb_setup(char *); extern int mc68x328fb_setup(char *);
extern int asiliantfb_init(void);
static struct { static struct {
const char *name; const char *name;
...@@ -385,6 +386,9 @@ static struct { ...@@ -385,6 +386,9 @@ static struct {
#ifdef CONFIG_FB_68328 #ifdef CONFIG_FB_68328
{ "68328fb", mc68x328fb_init, mc68x328fb_setup }, { "68328fb", mc68x328fb_init, mc68x328fb_setup },
#endif #endif
#ifdef CONFIG_FB_ASILIANT
{ "asiliantfb", asiliantfb_init, NULL },
#endif
/* /*
* Generic drivers that don't use resource management (yet) * Generic drivers that don't use resource management (yet)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment