diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2016-06-16 14:18:30 +0200 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2016-06-16 14:18:30 +0200 |
| commit | c19941218c9a1cae578dfbf30190b13b9cdb9aa8 (patch) | |
| tree | 0014d2ac89e6209c565f5a8fc53abd8dce13e63e /arch/arc/configs/vdk_hs38_smp_defconfig | |
| parent | drm/i915/ilk: Don't disable SSC source if it's in use (diff) | |
| parent | Merge tag 'topic/drm-misc-2016-06-15' of git://anongit.freedesktop.org/drm-in... (diff) | |
| download | linux-c19941218c9a1cae578dfbf30190b13b9cdb9aa8.tar.xz linux-c19941218c9a1cae578dfbf30190b13b9cdb9aa8.zip | |
Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next-queued
Backmerge drm-next to get at the nonblocking atomic helpers, needed to
merge the i915 conversion.
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Diffstat (limited to 'arch/arc/configs/vdk_hs38_smp_defconfig')
| -rw-r--r-- | arch/arc/configs/vdk_hs38_smp_defconfig | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/arc/configs/vdk_hs38_smp_defconfig b/arch/arc/configs/vdk_hs38_smp_defconfig index 52ec315dc5c9..969b206d6c67 100644 --- a/arch/arc/configs/vdk_hs38_smp_defconfig +++ b/arch/arc/configs/vdk_hs38_smp_defconfig @@ -63,12 +63,9 @@ CONFIG_SERIAL_8250_DW=y CONFIG_SERIAL_OF_PLATFORM=y # CONFIG_HW_RANDOM is not set # CONFIG_HWMON is not set -CONFIG_FB=y -CONFIG_ARCPGU_RGB888=y -CONFIG_ARCPGU_DISPTYPE=0 -# CONFIG_VGA_CONSOLE is not set +CONFIG_DRM=y +CONFIG_DRM_ARCPGU=y CONFIG_FRAMEBUFFER_CONSOLE=y -CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y CONFIG_LOGO=y # CONFIG_LOGO_LINUX_MONO is not set # CONFIG_LOGO_LINUX_VGA16 is not set |