From e47f00743fc4776491344f2c618cc8dc2c23bcbc Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Thu, 11 Jan 2001 04:02:40 +0000 Subject: Merge with Linux 2.4.0. --- drivers/video/fbmem.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'drivers/video/fbmem.c') 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... */ -- cgit v1.2.3