Skip to contentSkip to conversation

fix link error in atyfb with backlight disabled

PATCH In review Olaf Hering 2 participants 3 messages Jul 31, 2006 – Aug 1, 2006 Framebuffer layer

lore
Share & tools
lore

Olaf Hering

author
#0 lore raw

PATCH 1/1 fix link error in atyfb with backlight disabled

aty_bl_set_power is only defined if CONFIG_FB_ATY_BACKLIGHT is enabled.

Signed-off-by Olaf Hering <[email protected]>
drivers/video/aty/atyfb_base.c +2 -2
Index: linux-2.6.18-rc3/drivers/video/aty/atyfb_base.c
===================================================================
@@ -2812,7 +2812,7 @@ static int atyfb_blank(int blank, struct
 	if (par->lock_blank || par->asleep)
 		return 0;
 
-#ifdef CONFIG_PMAC_BACKLIGHT
+#if defined(CONFIG_PMAC_BACKLIGHT) && defined(CONFIG_FB_ATY_BACKLIGHT)
 	if (machine_is(powermac) && blank > FB_BLANK_NORMAL)
 		aty_bl_set_power(info, FB_BLANK_POWERDOWN);
 #elif defined(CONFIG_FB_ATY_GENERIC_LCD)

@@ -2844,7 +2844,7 @@ static int atyfb_blank(int blank, struct
 	}
 	aty_st_le32(CRTC_GEN_CNTL, gen_cntl, par);
 
-#ifdef CONFIG_PMAC_BACKLIGHT
+#if defined(CONFIG_PMAC_BACKLIGHT) && defined(CONFIG_FB_ATY_BACKLIGHT)
 	if (machine_is(powermac) && blank <= FB_BLANK_NORMAL)
 		aty_bl_set_power(info, FB_BLANK_UNBLANK);
 #elif defined(CONFIG_FB_ATY_GENERIC_LCD)
#1 lore raw
Quoted 19 lines · On Mon, 31 Jul 2006 20:52:20 +0200 Olaf Hering <[email protected]> wrote:

aty_bl_set_power is only defined if CONFIG_FB_ATY_BACKLIGHT is enabled.

Signed-off-by Olaf Hering <[email protected]>

Index: linux-2.6.18-rc3/drivers/video/aty/atyfb_base.c
===================================================================

drivers/video/aty/atyfb_base.c +1 -1
@@ -2812,7 +2812,7 @@ static int atyfb_blank(int blank, struct
 	if (par->lock_blank || par->asleep)
 		return 0;
 
-#ifdef CONFIG_PMAC_BACKLIGHT
+#if defined(CONFIG_PMAC_BACKLIGHT) && defined(CONFIG_FB_ATY_BACKLIGHT)
 	if (machine_is(powermac) && blank > FB_BLANK_NORMAL)
 		aty_bl_set_power(info, FB_BLANK_POWERDOWN);
 #elif defined(CONFIG_FB_ATY_GENERIC_LCD)

drivers/video/aty/atyfb_base.c static int atyfb_blank(int blank, struct · line 2850

Quoted 8 lines
drivers/video/aty/atyfb_base.c +1 -1
@@ -2844,7 +2844,7 @@ static int atyfb_blank(int blank, struct
 	}
 	aty_st_le32(CRTC_GEN_CNTL, gen_cntl, par);
 
-#ifdef CONFIG_PMAC_BACKLIGHT
+#if defined(CONFIG_PMAC_BACKLIGHT) && defined(CONFIG_FB_ATY_BACKLIGHT)
 	if (machine_is(powermac) && blank <= FB_BLANK_NORMAL)
 		aty_bl_set_power(info, FB_BLANK_UNBLANK);
 #elif defined(CONFIG_FB_ATY_GENERIC_LCD)

Linus merged a patch today (powermac-more-powermac-backlight-fixes.patch) whcih changes all this stuff. Its changelog included a mysterious "More Kconfig fixes".

So can you please see if current -git is indeed fixed?

Thanks.

author
#2 lore raw
Quoted 3 lines · Andrew Morton

Linus merged a patch today (powermac-more-powermac-backlight-fixes.patch) whcih changes all this stuff. Its changelog included a mysterious "More Kconfig fixes".

Yes, we all love those commits with other unrelated changes...

Quoted 1 line

So can you please see if current -git is indeed fixed?

It kind of works.
FB_ATY_BACKLIGHT depends on PMAC_BACKLIGHT right now.