diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-09-02 14:33:42 +0200 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-09-02 14:33:42 +0200 |
| commit | e93c28f39375558409329a02a767d5cadfcc4a31 (patch) | |
| tree | 9f1b4b5ce765b887b6002cded59fc934e6c9c012 /drivers/video/fbdev/Kconfig | |
| parent | drm/i915: Also record time difference if vblank evasion fails, v2. (diff) | |
| parent | i915: Set ddi_pll_sel in DP MST path (diff) | |
| download | linux-e93c28f39375558409329a02a767d5cadfcc4a31.tar.xz linux-e93c28f39375558409329a02a767d5cadfcc4a31.zip | |
Merge tag 'drm-intel-next-fixes-2015-09-02' into drm-intel-next-queued
Backmerge -fixes since there's more DDI-E related cleanups on top of
the pile of -fixes for skl that just landed for 4.3.
Conflicts:
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i914/intel_dp.c
drivers/gpu/drm/i915/intel_lrc.c
Conflicts are all fairly harmless adjacent line stuff.
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Diffstat (limited to 'drivers/video/fbdev/Kconfig')
| -rw-r--r-- | drivers/video/fbdev/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/fbdev/Kconfig b/drivers/video/fbdev/Kconfig index 2d98de535e0f..f888561568d9 100644 --- a/drivers/video/fbdev/Kconfig +++ b/drivers/video/fbdev/Kconfig @@ -298,7 +298,7 @@ config FB_ARMCLCD # Helper logic selected only by the ARM Versatile platform family. config PLAT_VERSATILE_CLCD - def_bool ARCH_VERSATILE || ARCH_REALVIEW || ARCH_VEXPRESS + def_bool ARCH_VERSATILE || ARCH_REALVIEW || ARCH_VEXPRESS || ARCH_INTEGRATOR depends on ARM depends on FB_ARMCLCD && FB=y |