Re: 2.6.12-rc3 compile failure in tgafb.c

[Adrian Bunk <bunk@stusta.de>]

On Thu, Apr 21, 2005 at 09:50:34PM +0300, Tomi Lapinlampi wrote:
> 
> Hi,
> 
> 2.6.12-rc3 compile fails in drivers/video/tgafb.c
> 
> The system is an Alphastation 600 5/266, system variant Alcor,
> running Debian Sarge, gcc version 3.3.5 (Debian 1:3.3.5-8)
> 
> Btw, the tgafb hasn't really worked on this hardware since 2.6.8.1.
> I'll be able to run more tests after this one compiles :)
> 
> Regards,
> 
> Tomi
> 
> % make
>   CHK     include/linux/version.h
> make[1]: `arch/alpha/kernel/asm-offsets.s' is up to date.
>   CHK     include/asm-alpha/asm_offsets.h
>   CHK     include/linux/compile.h
>   CHK     usr/initramfs_list
>   CC      drivers/video/tgafb.o
> drivers/video/tgafb.c:85: error: `tgafb_pci_unregister' undeclared here (not in a function)
> drivers/video/tgafb.c:85: error: initializer element is not constant
> drivers/video/tgafb.c:85: error: (near initialization for `tgafb_driver.remove')
> make[2]: *** [drivers/video/tgafb.o] Error 1
> make[1]: *** [drivers/video] Error 2
> make: *** [drivers] Error 2
>...

The untested patch below should fix this compile error.

Signed-off-by: Adrian Bunk <bunk@stusta.de>

--- linux-2.6.12-rc2-mm3-full/drivers/video/tgafb.c.old	2005-04-21 22:38:42.000000000 +0200
+++ linux-2.6.12-rc2-mm3-full/drivers/video/tgafb.c	2005-04-21 22:39:36.000000000 +0200
@@ -45,9 +45,7 @@
 static void tgafb_copyarea(struct fb_info *, const struct fb_copyarea *);
 
 static int tgafb_pci_register(struct pci_dev *, const struct pci_device_id *);
-#ifdef MODULE
 static void tgafb_pci_unregister(struct pci_dev *);
-#endif
 
 static const char *mode_option = "640x480@60";
 
@@ -1484,7 +1482,6 @@
 	return ret;
 }
 
-#ifdef MODULE
 static void __exit
 tgafb_pci_unregister(struct pci_dev *pdev)
 {
@@ -1500,6 +1497,7 @@
 	kfree(info);
 }
 
+#ifdef MODULE
 static void __exit
 tgafb_exit(void)
 {