Ben Hutchings <ben@xxxxxxxxxxxxxxx> writes: > CONFIG_ACPI_VIDEO depends on more than just CONFIG_ACPI, so add those > dependencies to the Kconfig select condition and make the code > conditional on CONFIG_ACPI_VIDEO. > > Signed-off-by: Ben Hutchings <ben@xxxxxxxxxxxxxxx> > --- > On Sat, 2010-12-25 at 16:21 +0100, Francisco Jerez wrote: > [...] >> > --- a/drivers/gpu/drm/nouveau/Makefile >> > +++ b/drivers/gpu/drm/nouveau/Makefile >> > @@ -30,6 +30,6 @@ nouveau-y := nouveau_drv.o nouveau_state.o nouveau_channel.o nouveau_mem.o \ >> > nouveau-$(CONFIG_DRM_NOUVEAU_DEBUG) += nouveau_debugfs.o >> > nouveau-$(CONFIG_COMPAT) += nouveau_ioc32.o >> > nouveau-$(CONFIG_DRM_NOUVEAU_BACKLIGHT) += nouveau_backlight.o >> > -nouveau-$(CONFIG_ACPI) += nouveau_acpi.o >> > +nouveau-$(CONFIG_ACPI_VIDEO) += nouveau_acpi.o >> > >> Not sure this makes sense, most of the code in nouveau_acpi.c doesn't >> depend on ACPI_VIDEO at all. Do you really need to do it? Apparently all >> the ACPI_VIDEO functions will be turned into stubs (see "acpi/video.h") >> on kernels without ACPI_VIDEO support. > [...] > > You're right; there's no need for the changes outside of Kconfig. > Thanks, I've pushed this to the Nouveau kernel tree, with a small clarification to the commit message. > Ben. > > drivers/gpu/drm/nouveau/Kconfig | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/drivers/gpu/drm/nouveau/Kconfig b/drivers/gpu/drm/nouveau/Kconfig > index 72730e9..21d6c29 100644 > --- a/drivers/gpu/drm/nouveau/Kconfig > +++ b/drivers/gpu/drm/nouveau/Kconfig > @@ -10,7 +10,7 @@ config DRM_NOUVEAU > select FB > select FRAMEBUFFER_CONSOLE if !EMBEDDED > select FB_BACKLIGHT if DRM_NOUVEAU_BACKLIGHT > - select ACPI_VIDEO if ACPI > + select ACPI_VIDEO if ACPI && X86 && BACKLIGHT_CLASS_DEVICE && VIDEO_OUTPUT_CONTROL && INPUT > help > Choose this option for open-source nVidia support. > > -- > 1.7.2.3
Attachment:
pgpyTQh0fRNWp.pgp
Description: PGP signature
_______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/dri-devel
