diff options
| author | Chris Wilson | 2011-01-23 18:22:16 +0100 |
|---|---|---|
| committer | Chris Wilson | 2011-01-24 19:27:32 +0100 |
| commit | 8a327f23e23fa509e6e3c2263ae1cc0a67dec387 (patch) | |
| tree | 119abf09e1ec9babaf78e6889187f9d54864b118 /drivers/gpu/drm/Kconfig | |
| parent | drm/i915: Handle the no-interrupts case for UMS by polling (diff) | |
| parent | Merge branch 'BUG_ON' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/... (diff) | |
| download | kernel-qcow2-linux-8a327f23e23fa509e6e3c2263ae1cc0a67dec387.tar.gz kernel-qcow2-linux-8a327f23e23fa509e6e3c2263ae1cc0a67dec387.tar.xz kernel-qcow2-linux-8a327f23e23fa509e6e3c2263ae1cc0a67dec387.zip | |
Merge remote branch 'linus/master' into drm-intel-fixes
Merge with Linus to resolve conflicting fixes for the reusing the stale
HEAD value during intel_ring_wait().
Conflicts:
drivers/gpu/drm/i915/intel_ringbuffer.c
Diffstat (limited to 'drivers/gpu/drm/Kconfig')
| -rw-r--r-- | drivers/gpu/drm/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig index 3a061094345b..0902d4460039 100644 --- a/drivers/gpu/drm/Kconfig +++ b/drivers/gpu/drm/Kconfig @@ -23,7 +23,7 @@ config DRM_KMS_HELPER tristate depends on DRM select FB - select FRAMEBUFFER_CONSOLE if !EMBEDDED + select FRAMEBUFFER_CONSOLE if !EXPERT help FB and CRTC helpers for KMS drivers. |