Merge with Linux 2.4.0.

5 files changed, 13 insertions, 13 deletions

diff --git a/drivers/video/Config.in b/drivers/video/Config.in
index b8a8fe374..4a41ab8f6 100644
--- a/drivers/video/Config.in
+++ b/drivers/video/Config.in
@@ -16,7 +16,7 @@ if [ "$CONFIG_FB" = "y" ]; then
       if [ "$CONFIG_AMIGA" = "y" -o "$CONFIG_PCI" = "y" ]; then
 	 tristate '  Cirrus Logic support (EXPERIMENTAL)' CONFIG_FB_CLGEN
 	 tristate '  Permedia2 support (EXPERIMENTAL)' CONFIG_FB_PM2
-	 if [ "$CONFIG_FB_PM2" = "y" ]; then
+	 if [ "$CONFIG_FB_PM2" = "y" -o "$CONFIG_FB_PM2" = "m" ]; then
 	    if [ "$CONFIG_PCI" = "y" ]; then
 	       bool '    enable FIFO disconnect feature' CONFIG_FB_PM2_FIFO_DISCONNECT
 	       bool '    generic Permedia2 PCI board support' CONFIG_FB_PM2_PCI
@@ -92,10 +92,10 @@ if [ "$CONFIG_FB" = "y" ]; then
       define_bool CONFIG_BUS_I2C y
    fi
    if [ "$CONFIG_SUN3" = "y" -o "$CONFIG_SUN3X" = "y" ]; then
-      bool 'Sun3 framebuffer support' CONFIG_FB_SUN3
+      bool '  Sun3 framebuffer support' CONFIG_FB_SUN3
       if [ "$CONFIG_FB_SUN3" != "n" ]; then
-         bool '  BWtwo support' CONFIG_FB_BWTWO
-         bool '  CGsix (GX,TurboGX) support' CONFIG_FB_CGSIX
+         bool '    BWtwo support' CONFIG_FB_BWTWO
+         bool '    CGsix (GX,TurboGX) support' CONFIG_FB_CGSIX
       fi
    fi
    if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
diff --git a/drivers/video/atyfb.c b/drivers/video/atyfb.c
index fb3b09bc9..3c0b9408f 100644
--- a/drivers/video/atyfb.c
+++ b/drivers/video/atyfb.c
@@ -1722,7 +1722,7 @@ static void aty_set_pll18818(const struct fb_info_aty *info,
     aty_st_8(CRTC_GEN_CNTL + 3, old_crtc_ext_disp | (CRTC_EXT_DISP_EN >> 24),
 	     info);
 
-    udelay(15000); /* delay for 50 (15) ms */
+    mdelay(15); /* delay for 50 (15) ms */
 
     program_bits = pll->program_bits;
     locationAddr = pll->locationAddr;
@@ -1754,7 +1754,7 @@ static void aty_set_pll18818(const struct fb_info_aty *info,
     aty_st_8(CLOCK_CNTL + info->clk_wr_offset, old_clock_cntl | CLOCK_STROBE,
 	     info);
 
-    udelay(50000); /* delay for 50 (15) ms */
+    mdelay(50); /* delay for 50 (15) ms */
     aty_st_8(CLOCK_CNTL + info->clk_wr_offset,
 	     ((pll->locationAddr & 0x0F) | CLOCK_STROBE), info);
 
diff --git a/drivers/video/clgenfb.c b/drivers/video/clgenfb.c
index e490910c9..32a26c2d7 100644
--- a/drivers/video/clgenfb.c
+++ b/drivers/video/clgenfb.c
@@ -1899,7 +1899,7 @@ static void __init init_vgachip (struct clgenfb_info *fb_info)
 		break;
 	case BT_PICASSO4:
 		vga_wcrt (fb_info->regs, CL_CRT51, 0x00);	/* disable flickerfixer */
-		udelay (100000);
+		mdelay (100);
 		vga_wgfx (fb_info->regs, CL_GR2F, 0x00);	/* from Klaus' NetBSD driver: */
 		vga_wgfx (fb_info->regs, CL_GR33, 0x00);	/* put blitter into 542x compat */
 		vga_wgfx (fb_info->regs, CL_GR31, 0x00);	/* mode */
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... */
diff --git a/drivers/video/retz3fb.c b/drivers/video/retz3fb.c
index ad1aeac38..9f1be5adc 100644
--- a/drivers/video/retz3fb.c
+++ b/drivers/video/retz3fb.c
@@ -1450,7 +1450,7 @@ int __init retz3fb_init(void)
 		       "video memory\n", GET_FB_IDX(fb_info->node),
 		       fb_info->modename, zinfo->fbsize>>10);
 
-		/* TODO: This driver cannot be unloaded yet */
+		/* FIXME: This driver cannot be unloaded yet */
 		MOD_INC_USE_COUNT;
 
 		res = 0;
@@ -1544,9 +1544,9 @@ void cleanup_module(void)
 	/*
 	 * Not reached because the usecount will never
 	 * be decremented to zero
+	 *
+	 * FIXME: clean up ... *
 	 */
-	unregister_framebuffer(&fb_info);
-	/* TODO: clean up ... */
 }
 #endif