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

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 selecting all dependencies as well.

Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Acked-by: Ben Skeggs <bskeggs@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>

diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
index 71ca63b79a4f09f712d295bef8f3d01fe6f1e7a2..a7c54c8432913ec6930518a648a4658737fdf1fe 100644 (file)
--- a/drivers/gpu/drm/Kconfig
+++ b/drivers/gpu/drm/Kconfig
@@ -139,6 +139,7 @@ config DRM_I915
        select BACKLIGHT_CLASS_DEVICE if ACPI
        select VIDEO_OUTPUT_CONTROL if ACPI
        select INPUT if ACPI
+       select THERMAL if ACPI
        select ACPI_VIDEO if ACPI
        select ACPI_BUTTON if ACPI
        help

diff --git a/drivers/gpu/drm/nouveau/Kconfig b/drivers/gpu/drm/nouveau/Kconfig
index a7ff6d5a34b9cf98de06611988162a7c9ad68643..ff80f12480ea2223ec85583cd47b01f4064a2fd8 100644 (file)
--- a/drivers/gpu/drm/nouveau/Kconfig
+++ b/drivers/gpu/drm/nouveau/Kconfig
@@ -15,6 +15,13 @@ config DRM_NOUVEAU
        select ACPI_WMI if ACPI && X86
        select MXM_WMI if ACPI && X86
        select POWER_SUPPLY
+       # Similar to i915, we need to select ACPI_VIDEO and it's dependencies
+       select BACKLIGHT_LCD_SUPPORT if ACPI && X86
+       select BACKLIGHT_CLASS_DEVICE if ACPI && X86
+       select VIDEO_OUTPUT_CONTROL if ACPI && X86
+       select INPUT if ACPI && X86
+       select THERMAL if ACPI && X86
+       select ACPI_VIDEO if ACPI && X86
        help
          Choose this option for open-source nVidia support.