diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-05-17 12:13:18 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-05-17 12:13:18 -0400 |
| commit | e1342f1da06d39b3bbd530e9306347c4438bc6e5 (patch) | |
| tree | 3d8d70c1e633d9bd5b929ad27b8123faa7789b84 /drivers/gpu/drm/Kconfig | |
| parent | 776abac81764847338a6a02c34609d4b8dfb4918 (diff) | |
| parent | ee348d5a1d810bc9958cabb7c27302aab235d36e (diff) | |
Merge branch 'smp-fix'
Diffstat (limited to 'drivers/gpu/drm/Kconfig')
| -rw-r--r-- | drivers/gpu/drm/Kconfig | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig index 17b24c580c09..4cd35d8fd799 100644 --- a/drivers/gpu/drm/Kconfig +++ b/drivers/gpu/drm/Kconfig | |||
| @@ -84,6 +84,12 @@ config DRM_I915 | |||
| 84 | config DRM_I915_KMS | 84 | config DRM_I915_KMS |
| 85 | bool "Enable modesetting on intel by default" | 85 | bool "Enable modesetting on intel by default" |
| 86 | depends on DRM_I915 | 86 | depends on DRM_I915 |
| 87 | # i915 KMS depends on ACPI_VIDEO when ACPI is enabled | ||
| 88 | # but for select to work, need to select ACPI_VIDEO's dependencies, ick | ||
| 89 | select VIDEO_OUTPUT_CONTROL if ACPI | ||
| 90 | select BACKLIGHT_CLASS_DEVICE if ACPI | ||
| 91 | select INPUT if ACPI | ||
| 92 | select ACPI_VIDEO if ACPI | ||
| 87 | help | 93 | help |
| 88 | Choose this option if you want kernel modesetting enabled by default, | 94 | Choose this option if you want kernel modesetting enabled by default, |
| 89 | and you have a new enough userspace to support this. Running old | 95 | and you have a new enough userspace to support this. Running old |