diff options
| author | Josh Boyer <jwboyer@fedoraproject.org> | 2016-03-21 19:59:11 -0400 |
|---|---|---|
| committer | Josh Boyer <jwboyer@fedoraproject.org> | 2016-03-21 19:59:11 -0400 |
| commit | 5093f682b9e4d983d277aaa0824cd0b01ec826c9 (patch) | |
| tree | 1c69430e799302d724302afe2100b46fa5dbcfc2 /config-arm-generic | |
| parent | 32ae36ddcefb8b70d0a8b9dceea3bdc853f6928e (diff) | |
| download | kernel-5093f682b9e4d983d277aaa0824cd0b01ec826c9.tar.gz kernel-5093f682b9e4d983d277aaa0824cd0b01ec826c9.tar.xz kernel-5093f682b9e4d983d277aaa0824cd0b01ec826c9.zip | |
Linux v4.5-10883-g770c4c1119db
- drm, arm64-perf, arc, udf, quota merges
Diffstat (limited to 'config-arm-generic')
| -rw-r--r-- | config-arm-generic | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/config-arm-generic b/config-arm-generic index 938815996..eb9af25a0 100644 --- a/config-arm-generic +++ b/config-arm-generic @@ -48,7 +48,7 @@ CONFIG_KERNEL_MODE_NEON=y CONFIG_ARM_CCI=y CONFIG_ARM_CCN=y CONFIG_ARM_CCI400_PMU=y -CONFIG_ARM_CCI500_PMU=y +CONFIG_ARM_CCI5xx_PMU=y CONFIG_ARM_DMA_USE_IOMMU=y CONFIG_ARM_DMA_IOMMU_ALIGNMENT=8 CONFIG_ARM_GIC=y @@ -120,6 +120,7 @@ CONFIG_ROCKCHIP_THERMAL=m CONFIG_DRM_ROCKCHIP=m CONFIG_ROCKCHIP_DW_HDMI=m CONFIG_ROCKCHIP_DW_MIPI_DSI=y +CONFIG_ROCKCHIP_INNO_HDMI=m CONFIG_PHY_ROCKCHIP_USB=m CONFIG_DWMAC_ROCKCHIP=m CONFIG_SND_SOC_ROCKCHIP=m @@ -514,6 +515,7 @@ CONFIG_NET_VENDOR_MELLANOX=y # drm # CONFIG_DRM_VMWGFX is not set # CONFIG_DRM_MSM_DSI is not set +# CONFIG_DRM_HDLCD is not set # CONFIG_IMX_IPUV3_CORE is not set # CONFIG_DEBUG_SET_MODULE_RONX is not set |