[PATCH] cyber2000: fix init/exit section confusion

- cyberpro_free_fb_info() is called by both __devinit & __devexit code,
  so it cannot be __devinit.

- igs_regs[] is used by resume code (indirectly), so it cannot be
  discardable.

This leaves one reference in cyber2000fb that 'make buildcheck' complains
about, but I believe that it's OK, that being ".probe" here:

static struct pci_driver cyberpro_driver =
{
	.name = "CyberPro",
	.probe = cyberpro_pci_probe,

Signed-off-by: Randy Dunlap <rddunlap@osdl.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/drivers/video/cyber2000fb.c b/drivers/video/cyber2000fb.c
index 8c959719794df98732ab0e0a2c33759d1a292c78..4dca34fdf7677079c6325fd0aad2e8d4aa94239f 100644 (file)
--- a/drivers/video/cyber2000fb.c
+++ b/drivers/video/cyber2000fb.c
@@ -1166,7 +1166,7 @@ static struct fb_videomode __devinitdata cyber2000fb_default_mode = {
        .vmode          = FB_VMODE_NONINTERLACED
 };
 
-static char igs_regs[] __devinitdata = {
+static char igs_regs[] = {
        EXT_CRT_IRQ,            0,
        EXT_CRT_TEST,           0,
        EXT_SYNC_CTL,           0,
@@ -1289,7 +1289,7 @@ cyberpro_alloc_fb_info(unsigned int id, char *name)
        return cfb;
 }
 
-static void __devinit
+static void
 cyberpro_free_fb_info(struct cfb_info *cfb)
 {
        if (cfb) {