nouveau: fix acpi_lid_open undefined
in [Kernel]
|
Prev: [PATCH 1/9] docbook: make mtd nand module init static
Next: [PATCH 3/9] Documentation/development-process: add staging & mmotm info
From: Ben Skeggs on 23 May 2010 20:10 On Sun, 2010-05-23 at 17:00 -0700, Randy Dunlap wrote: > From: Randy Dunlap <randy.dunlap(a)oracle.com> > > When CONFIG_ACPI_BUTTON=m (and probably when ACPI_BUTTON is not enabled) > and NOUVEAU is built-in (not as a loadable module): > > nouveau_connector.c:(.text+0xe17ce): undefined reference to `acpi_lid_open' > > Signed-off-by: Randy Dunlap <randy.dunlap(a)oracle.com> Acked-by: Ben Skeggs <bskeggs(a)redhat.com> > Cc: David Airlie <airlied(a)linux.ie> > Cc: dri-devel(a)lists.freedesktop.org > --- > drivers/gpu/drm/nouveau/nouveau_connector.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > --- linux-next-20100522.orig/drivers/gpu/drm/nouveau/nouveau_connector.c > +++ linux-next-20100522/drivers/gpu/drm/nouveau/nouveau_connector.c > @@ -241,7 +241,8 @@ nouveau_connector_detect(struct drm_conn > if (nv_encoder && nv_connector->native_mode) { > unsigned status = connector_status_connected; > > -#ifdef CONFIG_ACPI > +#if defined(CONFIG_ACPI_BUTTON) || \ > + (defined(CONFIG_ACPI_BUTTON_MODULE) && defined(MODULE)) > if (!nouveau_ignorelid && !acpi_lid_open()) > status = connector_status_unknown; > #endif -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
From: Matthew Garrett on 24 May 2010 09:00 On Sun, May 23, 2010 at 05:00:40PM -0700, Randy Dunlap wrote: > From: Randy Dunlap <randy.dunlap(a)oracle.com> > > When CONFIG_ACPI_BUTTON=m (and probably when ACPI_BUTTON is not enabled) > and NOUVEAU is built-in (not as a loadable module): Won't this result in a behavioural difference? The desirable outcome is that that configuration be impossible, not for that configuration to build but be buggy. -- Matthew Garrett | mjg59(a)srcf.ucam.org -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
From: Randy Dunlap on 24 May 2010 10:00 On 05/24/10 05:56, Matthew Garrett wrote: > On Sun, May 23, 2010 at 05:00:40PM -0700, Randy Dunlap wrote: >> From: Randy Dunlap <randy.dunlap(a)oracle.com> >> >> When CONFIG_ACPI_BUTTON=m (and probably when ACPI_BUTTON is not enabled) >> and NOUVEAU is built-in (not as a loadable module): > > Won't this result in a behavioural difference? The desirable outcome is It could, yes. > that that configuration be impossible, not for that configuration to > build but be buggy. so nouveau should depend on (or select, if ACPI is enabled) ACPI_BUTTON? -- ~Randy *** Remember to use Documentation/SubmitChecklist when testing your code *** -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
From: Matthew Garrett on 24 May 2010 10:10 On Mon, May 24, 2010 at 06:53:51AM -0700, Randy Dunlap wrote: > On 05/24/10 05:56, Matthew Garrett wrote: > > Won't this result in a behavioural difference? The desirable outcome is > > It could, yes. > > > that that configuration be impossible, not for that configuration to > > build but be buggy. > > so nouveau should depend on (or select, if ACPI is enabled) ACPI_BUTTON? There's an argument that it doesn't need to depend on it, but if button is a module then nouveau has to be. Except the inverse isn't true. Kconfig is hard, let's weep gently. -- Matthew Garrett | mjg59(a)srcf.ucam.org -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
From: Randy Dunlap on 24 May 2010 10:20
On 05/24/10 06:59, Matthew Garrett wrote: > On Mon, May 24, 2010 at 06:53:51AM -0700, Randy Dunlap wrote: >> On 05/24/10 05:56, Matthew Garrett wrote: >>> Won't this result in a behavioural difference? The desirable outcome is >> >> It could, yes. >> >>> that that configuration be impossible, not for that configuration to >>> build but be buggy. >> >> so nouveau should depend on (or select, if ACPI is enabled) ACPI_BUTTON? > > There's an argument that it doesn't need to depend on it, but if button > is a module then nouveau has to be. Except the inverse isn't true. > Kconfig is hard, let's weep gently. Maybe Dave can weep with us when he is back at work... -- ~Randy *** Remember to use Documentation/SubmitChecklist when testing your code *** -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |