drm/nouveau: always select ACPI_VIDEO if ACPI is enabled.
authorMaarten Lankhorst <m.b.lankhorst@gmail.com>
Thu, 27 Jun 2013 11:38:23 +0000 (13:38 +0200)
committerDave Airlie <airlied@redhat.com>
Fri, 28 Jun 2013 01:56:22 +0000 (11:56 +1000)
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>
drivers/gpu/drm/Kconfig
drivers/gpu/drm/nouveau/Kconfig

index 71ca63b..a7c54c8 100644 (file)
@@ -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
index a7ff6d5..ff80f12 100644 (file)
@@ -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.