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 at canonical.com>
---
 drivers/gpu/drm/Kconfig         | 1 +
 drivers/gpu/drm/nouveau/Kconfig | 7 +++++++
 2 files changed, 8 insertions(+)

diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
index 71ca63b..a7c54c8 100644
--- 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 a7ff6d5..ff80f12 100644
--- 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.

-- 
1.8.3.1

Reply via email to