diff options
| author | Peter Griffin <peter.griffin@linaro.org> | 2015-07-23 17:55:21 +0100 |
|---|---|---|
| committer | Peter Griffin <peter.griffin@linaro.org> | 2015-07-23 17:55:21 +0100 |
| commit | b829c433704436ac3a09015d3393f8b4ee2a04ae (patch) | |
| tree | 717f54494d5b0c68aab1f5d9f5c0eacd39c79dfa | |
| parent | 93195793b35cdcf1143542431839e47f8ad72b21 (diff) | |
multi_v7: Disable DRM_STI and enable DRMTESTfdma-support-v4.1-with-audio
Signed-off-by: Peter Griffin <peter.griffin@linaro.org>
| -rw-r--r-- | arch/arm/configs/multi_v7_defconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index a36195a06c3f..0c6977a3b76e 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -1,3 +1,5 @@ +CONFIG_DMATEST=y + CONFIG_SYSVIPC=y CONFIG_FHANDLE=y CONFIG_IRQ_DOMAIN_DEBUG=y @@ -601,8 +603,6 @@ CONFIG_I2C_MUX_PCA954x=y CONFIG_I2C_ST=y CONFIG_USB_VIDEO_CLASS=y CONFIG_USB_GSPCA=y -CONFIG_DRM_STI=y -CONFIG_DRM_STI_FBDEV=y CONFIG_CGROUPS=y CONFIG_CGROUP_DEBUG=y CONFIG_CGROUP_FREEZER=y |