Several fixes relating to modules. Ported over the vga16fb driver to the new api.

drivers/video/Makefile

@@ -50,7 +50,7 @@ obj-$(CONFIG_FB_TRIDENT)	  += tridentfb.o
 obj-$(CONFIG_FB_S3TRIO)           += S3triofb.o
 obj-$(CONFIG_FB_TGA)              += tgafb.o
 obj-$(CONFIG_FB_VESA)             += vesafb.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o 
-obj-$(CONFIG_FB_VGA16)            += vga16fb.o fbcon-vga-planes.o
+obj-$(CONFIG_FB_VGA16)            += vga16fb.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o 
 obj-$(CONFIG_FB_VIRGE)            += virgefb.o
 obj-$(CONFIG_FB_G364)             += g364fb.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o
 obj-$(CONFIG_FB_FM2)              += fm2fb.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o

drivers/video/aty/atyfb_base.c

@@ -2633,15 +2633,15 @@ void cleanup_module(void)
 	if (info->screen_base)
 		iounmap((void *) info->screen_base);
 #ifdef __BIG_ENDIAN
-	if (info->cursor && info->cursor->ram)
-		iounmap(info->cursor->ram);
+	if (par->cursor && par->cursor->ram)
+		iounmap(par->cursor->ram);
 #endif
 #endif
 
-	if (info->cursor) {
-		if (info->cursor->timer)
-			kfree(info->cursor->timer);
-		kfree(info->cursor);
+	if (par->cursor) {
+		if (par->cursor->timer)
+			kfree(par->cursor->timer);
+		kfree(par->cursor);
 	}
 #ifdef __sparc__
 	if (par->mmap_map)

drivers/video/console/Kconfig

@@ -120,13 +120,13 @@ config FBCON_ADVANCED
 
 config FBCON_ACCEL
 	tristate "Hardware acceleration support" if FBCON_ADVANCED
-	depends on FB
-	default m if !FBCON_ADVANCED && FB_NEOMAGIC!=y && !FB_VESA && !FB_FM2 && FB_HIT!=y && !FB_HP300 && !FB_Q40 && !FB_ANAKIN && !FB_G364 && FB_VIRTUAL!=y && !FB_CLPS711X && !FB_PMAG_BA && !FB_PMAGB_B && FB_3DFX!=y && !FB_TX3912 && !FB_MAXINE && !FB_APOLLO && FB_ATY!=y && !FB_MAC && FB_RIVA!=y && FB_HGA!=y && !FB_OF && FB_SGIVW!=y && (FB_NEOMAGIC=m || FB_HIT=m || FB_VIRTUAL=m || FB_3DFX=m || FB_RIVA=m || FB_SGIVW=m || FB_HGA=m)
-	default y if !FBCON_ADVANCED && (FB_NEOMAGIC=y || FB_VESA || FB_FM2 || FB_HIT=y || FB_HP300 || FB_Q40 || FB_ANAKIN || FB_G364 || FB_VIRTUAL=y || FB_CLPS711X || FB_PMAG_BA || FB_PMAGB_B || FB_3DFX=y || FB_TX3912 || FB_MAXINE || FB_APOLLO || FB_ATY=y || FB_MAC || FB_RIVA=y || FB_OF || FB_SGIVW=y || FB_HGA=y)
+	depends on FRAMEBUFFER_CONSOLE 
+	default m if !FBCON_ADVANCED && FB_NEOMAGIC!=y && !FB_VESA && !FB_FM2 && FB_HIT!=y && !FB_HP300 && !FB_Q40 && !FB_ANAKIN && !FB_G364 && FB_VIRTUAL!=y && !FB_CLPS711X && !FB_PMAG_BA && !FB_PMAGB_B && FB_3DFX!=y && !FB_TX3912 && !FB_MAXINE && !FB_APOLLO && FB_ATY!=y && !FB_MAC && FB_RIVA!=y && FB_HGA!=y && !FB_OF && FB_SGIVW!=y && FB_VGA16!=y && (FB_NEOMAGIC=m || FB_HIT=m || FB_VIRTUAL=m || FB_3DFX=m || FB_RIVA=m || FB_SGIVW=m || FB_HGA=m)
+	default y if !FBCON_ADVANCED && (FB_NEOMAGIC=y || FB_VESA || FB_FM2 || FB_HIT=y || FB_HP300 || FB_Q40 || FB_ANAKIN || FB_G364 || FB_VIRTUAL=y || FB_CLPS711X || FB_PMAG_BA || FB_PMAGB_B || FB_3DFX=y || FB_TX3912 || FB_MAXINE || FB_APOLLO || FB_ATY=y || FB_MAC || FB_RIVA=y || FB_OF || FB_SGIVW=y || FB_HGA=y || FB_VGA16)
 
 config FBCON_AFB
 	tristate "Amiga bitplanes support" if FBCON_ADVANCED
-	depends on FB
+	depends on FRAMEBUFFER_CONSOLE 
 	default m if !FBCON_ADVANCED && FB_AMIGA=m
 	default y if !FBCON_ADVANCED && FB_AMIGA=y
 	help
@@ -135,7 +135,7 @@ config FBCON_AFB
 
 config FBCON_ILBM
 	tristate "Amiga interleaved bitplanes support" if FBCON_ADVANCED
-	depends on FB
+	depends on FRAMEBUFFER_CONSOLE 
 	default m if !FBCON_ADVANCED && FB_AMIGA=m
 	default y if !FBCON_ADVANCED && FB_AMIGA=y
 	help
@@ -144,7 +144,7 @@ config FBCON_ILBM
 
 config FBCON_IPLAN2P2
 	tristate "Atari interleaved bitplanes (2 planes) support" if FBCON_ADVANCED
-	depends on FB
+	depends on FRAMEBUFFER_CONSOLE 
 	default y if !FBCON_ADVANCED && FB_ATARI
 	help
 	  This is the low level frame buffer console driver for 2 interleaved
@@ -152,7 +152,7 @@ config FBCON_IPLAN2P2
 
 config FBCON_IPLAN2P4
 	tristate "Atari interleaved bitplanes (4 planes) support" if FBCON_ADVANCED
-	depends on FB
+	depends on FRAMEBUFFER_CONSOLE 
 	default y if !FBCON_ADVANCED && FB_ATARI
 	help
 	  This is the low level frame buffer console driver for 4 interleaved
@@ -160,7 +160,7 @@ config FBCON_IPLAN2P4
 
 config FBCON_IPLAN2P8
 	tristate "Atari interleaved bitplanes (8 planes) support" if FBCON_ADVANCED
-	depends on FB
+	depends on FRAMEBUFFER_CONSOLE 
 	default y if !FBCON_ADVANCED && FB_ATARI
 	help
 	  This is the low level frame buffer console driver for 8 interleaved
@@ -169,7 +169,7 @@ config FBCON_IPLAN2P8
 # Guess what we need
 config FBCON_STI
 	tristate
-	depends on !FBCON_ADVANCED && FB_STI
+	depends on !FBCON_ADVANCED && FRAMEBUFFER_CONSOLE && FB_STI
 	default y
 
 config FBCON_FONTWIDTH8_ONLY

drivers/video/console/vgacon.c

@@ -844,8 +844,8 @@ vgacon_do_font_op(char *arg, int set, int ch512)
 static int
 vgacon_adjust_height(unsigned fontheight)
 {
-	int rows, maxscan;
 	unsigned char ovr, vde, fsr;
+	int rows, maxscan, i;
 
 	if (fontheight == vga_video_font_height)
 		return 0;

drivers/video/fbmem.c

@@ -771,8 +771,8 @@ static devfs_handle_t devfs_handle;
 int
 register_framebuffer(struct fb_info *fb_info)
 {
-	static int fb_ever_opened[FB_MAX];
 #ifdef CONFIG_FRAMEBUFFER_CONSOLE
+	static int fb_ever_opened[FB_MAX];
 	static int first = 1;
 	int j;
 #endif
@@ -788,9 +788,9 @@ register_framebuffer(struct fb_info *fb_info)
 	fb_info->node = mk_kdev(FB_MAJOR, i);
 	fb_info->currcon = -1;
 	registered_fb[i] = fb_info;
+#ifdef CONFIG_FRAMEBUFFER_CONSOLE
 	if (!fb_ever_opened[i]) {
 		struct module *owner = fb_info->fbops->owner;
-#ifdef CONFIG_FRAMEBUFFER_CONSOLE
 		/*
 		 *  We assume initial frame buffer devices can be opened this
 		 *  many times
@@ -813,14 +813,6 @@ register_framebuffer(struct fb_info *fb_info)
 		first = 0;
 		take_over_console(&fb_con, first_fb_vc, last_fb_vc, fbcon_is_default);
 	}
-#else
-		if (owner) {
-			__MOD_INC_USE_COUNT(owner);
-			if (fb_info->fbops->fb_open && fb_info->fbops->fb_open(fb_info,0))
-				__MOD_DEC_USE_COUNT(owner);
-		}
-		fb_ever_opened[i] = 1;
-	}
 #endif
 	sprintf (name_buf, "%d", i);
 	fb_info->devfs_handle =