Commit d64c132f authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Paul Mundt
Browse files

fbdev/atyfb: Fix 2 defined-but-not-used warnings



If CONFIG_FB_ATY_BACKLIGHT=y but CONFIG_PCI=n:

drivers/video/aty/atyfb_base.c:2272: warning: ‘aty_bl_exit’ defined but not used

If CONFIG_ATARI=y for a modular build:

drivers/video/aty/atyfb_base.c:2794: warning: ‘store_video_par’ defined but not
used

Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent e6b8480c
Loading
Loading
Loading
Loading
+4 −6
Original line number Original line Diff line number Diff line
@@ -248,10 +248,6 @@ static int atyfb_sync(struct fb_info *info);


static int aty_init(struct fb_info *info);
static int aty_init(struct fb_info *info);


#ifdef CONFIG_ATARI
static int store_video_par(char *videopar, unsigned char m64_num);
#endif

static void aty_get_crtc(const struct atyfb_par *par, struct crtc *crtc);
static void aty_get_crtc(const struct atyfb_par *par, struct crtc *crtc);


static void aty_set_crtc(const struct atyfb_par *par, const struct crtc *crtc);
static void aty_set_crtc(const struct atyfb_par *par, const struct crtc *crtc);
@@ -2268,11 +2264,13 @@ error:
	return;
	return;
}
}


#ifdef CONFIG_PCI
static void aty_bl_exit(struct backlight_device *bd)
static void aty_bl_exit(struct backlight_device *bd)
{
{
	backlight_device_unregister(bd);
	backlight_device_unregister(bd);
	printk("aty: Backlight unloaded\n");
	printk("aty: Backlight unloaded\n");
}
}
#endif /* CONFIG_PCI */


#endif /* CONFIG_FB_ATY_BACKLIGHT */
#endif /* CONFIG_FB_ATY_BACKLIGHT */


@@ -2789,7 +2787,7 @@ aty_init_exit:
	return ret;
	return ret;
}
}


#ifdef CONFIG_ATARI
#if defined(CONFIG_ATARI) && !defined(MODULE)
static int __devinit store_video_par(char *video_str, unsigned char m64_num)
static int __devinit store_video_par(char *video_str, unsigned char m64_num)
{
{
	char *p;
	char *p;
@@ -2818,7 +2816,7 @@ static int __devinit store_video_par(char *video_str, unsigned char m64_num)
	phys_vmembase[m64_num] = 0;
	phys_vmembase[m64_num] = 0;
	return -1;
	return -1;
}
}
#endif /* CONFIG_ATARI */
#endif /* CONFIG_ATARI && !MODULE */


/*
/*
 * Blank the display.
 * Blank the display.