summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2009-04-24 19:33:47 +0400
committerLen Brown <len.brown@intel.com>2009-05-16 06:52:21 +0400
commitecb4aed78dcf09e48c8c34c8c2fa7f5c69344be6 (patch)
treeae3bdf57fc747c69ce2bcd37c02fadf5ad77c101
parent091069740304c979f957ceacec39c461d0192158 (diff)
downloadlinux-ecb4aed78dcf09e48c8c34c8c2fa7f5c69344be6.tar.xz
ACPI, i915: build fix
drivers/built-in.o: In function `intel_opregion_init': (.text+0x9d540): undefined reference to `acpi_video_register' http://bugzilla.kernel.org/show_bug.cgi?id=13165 Signed-off-by: Len Brown <len.brown@intel.com>
-rw-r--r--drivers/gpu/drm/Kconfig6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
index 3a22eb9be378..f33d25279912 100644
--- a/drivers/gpu/drm/Kconfig
+++ b/drivers/gpu/drm/Kconfig
@@ -83,6 +83,12 @@ config DRM_I915
config DRM_I915_KMS
bool "Enable modesetting on intel by default"
depends on DRM_I915
+ # i915 KMS depends on ACPI_VIDEO when ACPI is enabled
+ # but for select to work, need to select ACPI_VIDEO's dependencies, ick
+ select VIDEO_OUTPUT_CONTROL if ACPI
+ select BACKLIGHT_CLASS_DEVICE if ACPI
+ select INPUT if ACPI
+ select ACPI_VIDEO if ACPI
help
Choose this option if you want kernel modesetting enabled by default,
and you have a new enough userspace to support this. Running old