[PATCH] drm/nouveau: always select ACPI_VIDEO if ACPI is enabled.

[Maarten Lankhorst <maarten.lankhorst@canonical.com>]

Hey,

Op 04-02-13 16:23, Borislav Petkov schreef:
> Hi,
>
> I'm guessing someone has already triggered this on latest Linus' tree
> and has a fix?
>
> drivers/built-in.o: In function `nouveau_acpi_edid':
> /w/kernel/linux/drivers/gpu/drm/nouveau/nouveau_acpi.c:420: undefined reference to `acpi_video_get_edid'
> make: *** [vmlinux] Error 1
>
> Btw, I got CONFIG_ACPI_VIDEO=m while CONFIG_DRM_NOUVEAU=y and this is
> probably the reason for the vmlinux link error.
>
> Thanks.
>
Does this fix things?

-->8
Having nouveau builtin would still allow ACPI_VIDEO to be used as external module if some of the deps for acpi_video
have not been met, which would result in a linking failure. Solve this by only requiring ACPI && X86 to select ACPI_VIDEO.

Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>

---
diff --git a/drivers/gpu/drm/nouveau/Kconfig b/drivers/gpu/drm/nouveau/Kconfig
index 8a55bee..f08b9b6 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 !EXPERT
 	select FB_BACKLIGHT if DRM_NOUVEAU_BACKLIGHT
-	select ACPI_VIDEO if ACPI && X86 && BACKLIGHT_CLASS_DEVICE && VIDEO_OUTPUT_CONTROL && INPUT
+	select ACPI_VIDEO if ACPI && X86
 	select ACPI_WMI if ACPI
 	select MXM_WMI if ACPI
 	select POWER_SUPPLY