diff options
| author | Dave Airlie <airlied@redhat.com> | 2015-01-26 17:54:11 -0500 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2015-01-26 17:54:11 -0500 |
| commit | e4514003c6d0afd0a2d7e23e397530d746f34057 (patch) | |
| tree | 0a87f4514fc938b2f9df5a731f03fb1c23c11a3e /drivers/gpu/drm/exynos | |
| parent | bdfcea4bdcd354023b1a93abdaf6b176c3dd545b (diff) | |
| parent | b7703726251191cd9f3ef3a80b2d9667901eec95 (diff) | |
Merge tag 'topic/core-stuff-2015-01-23' of git://anongit.freedesktop.org/drm-intel into drm-next
Just flushing out my drm-misc branch, nothing major. Well too old patches
I've dug out from years since a patch from Rob look eerily familiar ;-)
* tag 'topic/core-stuff-2015-01-23' of git://anongit.freedesktop.org/drm-intel:
drm/probe-helper: clamp unknown connector status in the poll work
drm/probe-helper: don't lose hotplug event
next: drm/atomic: Use copy_from_user to copy 64 bit data from user space
drm: Make drm_read() more robust against multithreaded races
drm/fb-helper: Propagate errors from initial config failure
drm: Drop superfluous "select VT_HW_CONSOLE_BINDING"
Diffstat (limited to 'drivers/gpu/drm/exynos')
| -rw-r--r-- | drivers/gpu/drm/exynos/Kconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/gpu/drm/exynos/Kconfig b/drivers/gpu/drm/exynos/Kconfig index 7f9f6f9e9b7e..c072999b7e03 100644 --- a/drivers/gpu/drm/exynos/Kconfig +++ b/drivers/gpu/drm/exynos/Kconfig | |||
| @@ -6,7 +6,6 @@ config DRM_EXYNOS | |||
| 6 | select FB_CFB_FILLRECT | 6 | select FB_CFB_FILLRECT |
| 7 | select FB_CFB_COPYAREA | 7 | select FB_CFB_COPYAREA |
| 8 | select FB_CFB_IMAGEBLIT | 8 | select FB_CFB_IMAGEBLIT |
| 9 | select VT_HW_CONSOLE_BINDING if FRAMEBUFFER_CONSOLE | ||
| 10 | select VIDEOMODE_HELPERS | 9 | select VIDEOMODE_HELPERS |
| 11 | help | 10 | help |
| 12 | Choose this option if you have a Samsung SoC EXYNOS chipset. | 11 | Choose this option if you have a Samsung SoC EXYNOS chipset. |