diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2001-01-11 04:02:40 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2001-01-11 04:02:40 +0000 |
| commit | e47f00743fc4776491344f2c618cc8dc2c23bcbc (patch) | |
| tree | 13e03a113a82a184c51c19c209867cfd3a59b3b9 /drivers/video/fbmem.c | |
| parent | b2ad5f821b1381492d792ca10b1eb7a107b48f14 (diff) | |
Merge with Linux 2.4.0.
Diffstat (limited to 'drivers/video/fbmem.c')
| -rw-r--r-- | drivers/video/fbmem.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c index 60b76a447..75b6aee16 100644 --- a/drivers/video/fbmem.c +++ b/drivers/video/fbmem.c @@ -202,9 +202,6 @@ static struct { * management! */ -#ifdef CONFIG_FB_STI - { "stifb", stifb_init, stifb_setup }, -#endif #ifdef CONFIG_FB_OF { "offb", offb_init, NULL }, #endif @@ -269,6 +266,9 @@ static struct { #ifdef CONFIG_FB_VGA16 { "vga16", vga16fb_init, vga16fb_setup }, #endif +#ifdef CONFIG_FB_STI + { "stifb", stifb_init, stifb_setup }, +#endif #ifdef CONFIG_GSP_RESOLVER /* Not a real frame buffer device... */ |