* [PATCH] fix link error in atyfb with backlight disabled
@ 2006-07-31 18:52 Olaf Hering
2006-08-01 6:31 ` Andrew Morton
0 siblings, 1 reply; 3+ messages in thread
From: Olaf Hering @ 2006-07-31 18:52 UTC (permalink / raw)
To: Andrew Morton, Benjamin Herrenschmidt, linux-kernel
aty_bl_set_power is only defined if CONFIG_FB_ATY_BACKLIGHT is enabled.
Signed-off-by: Olaf Hering <olh@suse.de>
Index: linux-2.6.18-rc3/drivers/video/aty/atyfb_base.c
===================================================================
--- linux-2.6.18-rc3.orig/drivers/video/aty/atyfb_base.c
+++ 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)
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] fix link error in atyfb with backlight disabled
2006-07-31 18:52 [PATCH] fix link error in atyfb with backlight disabled Olaf Hering
@ 2006-08-01 6:31 ` Andrew Morton
2006-08-01 7:36 ` Olaf Hering
0 siblings, 1 reply; 3+ messages in thread
From: Andrew Morton @ 2006-08-01 6:31 UTC (permalink / raw)
To: Olaf Hering; +Cc: benh, linux-kernel
On Mon, 31 Jul 2006 20:52:20 +0200
Olaf Hering <olh@suse.de> wrote:
>
> aty_bl_set_power is only defined if CONFIG_FB_ATY_BACKLIGHT is enabled.
>
> Signed-off-by: Olaf Hering <olh@suse.de>
>
> Index: linux-2.6.18-rc3/drivers/video/aty/atyfb_base.c
> ===================================================================
> --- linux-2.6.18-rc3.orig/drivers/video/aty/atyfb_base.c
> +++ 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)
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.
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] fix link error in atyfb with backlight disabled
2006-08-01 6:31 ` Andrew Morton
@ 2006-08-01 7:36 ` Olaf Hering
0 siblings, 0 replies; 3+ messages in thread
From: Olaf Hering @ 2006-08-01 7:36 UTC (permalink / raw)
To: Andrew Morton; +Cc: benh, linux-kernel
On Mon, Jul 31, Andrew Morton wrote:
> 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...
> So can you please see if current -git is indeed fixed?
It kind of works.
FB_ATY_BACKLIGHT depends on PMAC_BACKLIGHT right now.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2006-08-01 7:36 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-07-31 18:52 [PATCH] fix link error in atyfb with backlight disabled Olaf Hering
2006-08-01 6:31 ` Andrew Morton
2006-08-01 7:36 ` Olaf Hering
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox