diff options
author | Dave Airlie <airlied@redhat.com> | 2009-09-07 21:08:32 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2009-09-07 21:15:58 -0400 |
commit | 6fcefd56f5060ca99ab03c9f2ad1f17c3a543ca1 (patch) | |
tree | 0bab06d1bc08205f3598a0627041e9b2c4abc34c /drivers/gpu/drm/Kconfig | |
parent | 3ce0a23d2d253185df24e22e3d5f89800bb3dd1c (diff) |
drm/kms: fix kms helper license + Kconfig
Allow the KMS module to work properly, and also rename
it to KMS_HELPER so its clearer what its for.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/Kconfig')
-rw-r--r-- | drivers/gpu/drm/Kconfig | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig index 8c7309177c08..d42cf54f7804 100644 --- a/drivers/gpu/drm/Kconfig +++ b/drivers/gpu/drm/Kconfig | |||
@@ -18,12 +18,13 @@ menuconfig DRM | |||
18 | details. You should also select and configure AGP | 18 | details. You should also select and configure AGP |
19 | (/dev/agpgart) support. | 19 | (/dev/agpgart) support. |
20 | 20 | ||
21 | config DRM_MODE_HELPER | 21 | config DRM_KMS_HELPER |
22 | tristate | 22 | tristate |
23 | depends on DRM | 23 | depends on DRM |
24 | select FB | 24 | select FB |
25 | select FRAMEBUFFER_CONSOLE if !EMBEDDED | ||
25 | help | 26 | help |
26 | FB and CRTC helpers for kms drivers. | 27 | FB and CRTC helpers for KMS drivers. |
27 | 28 | ||
28 | config DRM_TTM | 29 | config DRM_TTM |
29 | tristate | 30 | tristate |
@@ -90,11 +91,10 @@ config DRM_I830 | |||
90 | config DRM_I915 | 91 | config DRM_I915 |
91 | tristate "i915 driver" | 92 | tristate "i915 driver" |
92 | depends on AGP_INTEL | 93 | depends on AGP_INTEL |
93 | select DRM_MODE_HELPER | 94 | select DRM_KMS_HELPER |
94 | select FB_CFB_FILLRECT | 95 | select FB_CFB_FILLRECT |
95 | select FB_CFB_COPYAREA | 96 | select FB_CFB_COPYAREA |
96 | select FB_CFB_IMAGEBLIT | 97 | select FB_CFB_IMAGEBLIT |
97 | select FRAMEBUFFER_CONSOLE if !EMBEDDED | ||
98 | # i915 depends on ACPI_VIDEO when ACPI is enabled | 98 | # i915 depends on ACPI_VIDEO when ACPI is enabled |
99 | # but for select to work, need to select ACPI_VIDEO's dependencies, ick | 99 | # but for select to work, need to select ACPI_VIDEO's dependencies, ick |
100 | select VIDEO_OUTPUT_CONTROL if ACPI | 100 | select VIDEO_OUTPUT_CONTROL if ACPI |