Commit 056bb24d authored by Randy Dunlap's avatar Randy Dunlap Committed by Linus Torvalds

[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: default avatarRandy Dunlap <rddunlap@osdl.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 139a6134
...@@ -1166,7 +1166,7 @@ static struct fb_videomode __devinitdata cyber2000fb_default_mode = { ...@@ -1166,7 +1166,7 @@ static struct fb_videomode __devinitdata cyber2000fb_default_mode = {
.vmode = FB_VMODE_NONINTERLACED .vmode = FB_VMODE_NONINTERLACED
}; };
static char igs_regs[] __devinitdata = { static char igs_regs[] = {
EXT_CRT_IRQ, 0, EXT_CRT_IRQ, 0,
EXT_CRT_TEST, 0, EXT_CRT_TEST, 0,
EXT_SYNC_CTL, 0, EXT_SYNC_CTL, 0,
...@@ -1289,7 +1289,7 @@ cyberpro_alloc_fb_info(unsigned int id, char *name) ...@@ -1289,7 +1289,7 @@ cyberpro_alloc_fb_info(unsigned int id, char *name)
return cfb; return cfb;
} }
static void __devinit static void
cyberpro_free_fb_info(struct cfb_info *cfb) cyberpro_free_fb_info(struct cfb_info *cfb)
{ {
if (cfb) { if (cfb) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment