diff options
author | 2017-08-28 10:19:01 +0200 | |
---|---|---|
committer | 2017-08-28 10:19:01 +0200 | |
commit | 9749c37275cb1f72d309e676642f45eb92724190 (patch) | |
tree | 7ecfdc655eebb56ddfee430f7f05e641ec4b49bb /drivers/gpu/ipu-v3/Kconfig | |
parent | binder: fix incorrect cmd to binder_stat_br (diff) | |
parent | Linux 4.13-rc7 (diff) | |
download | linux-dev-9749c37275cb1f72d309e676642f45eb92724190.tar.xz linux-dev-9749c37275cb1f72d309e676642f45eb92724190.zip |
Merge 4.13-rc7 into char-misc-next
We want the binder fix in here as well for testing and merge issues.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/gpu/ipu-v3/Kconfig')
-rw-r--r-- | drivers/gpu/ipu-v3/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/ipu-v3/Kconfig b/drivers/gpu/ipu-v3/Kconfig index 08766c6e7856..87a20b3dcf7a 100644 --- a/drivers/gpu/ipu-v3/Kconfig +++ b/drivers/gpu/ipu-v3/Kconfig @@ -1,6 +1,7 @@ config IMX_IPUV3_CORE tristate "IPUv3 core support" depends on SOC_IMX5 || SOC_IMX6Q || ARCH_MULTIPLATFORM + depends on DRM || !DRM # if DRM=m, this can't be 'y' select GENERIC_IRQ_CHIP help Choose this if you have a i.MX5/6 system and want to use the Image |