diff options
| author | Arnd Bergmann | 2017-10-19 22:41:48 +0200 |
|---|---|---|
| committer | Arnd Bergmann | 2017-10-19 22:41:48 +0200 |
| commit | 06743cbfc5e11d6af3293e4f7e5468ab83f3e369 (patch) | |
| tree | acb7925763d055cc69dc685631be787f09a71621 /arch/arm64/configs | |
| parent | 52ba30ebe250750567694a808c488a12e5dcc97a (diff) | |
| parent | f9a3da591d4bf5ad28eb9ffabc823dee9e4254f4 (diff) | |
Merge tag 'hisi-defconfig-for-4.15' of git://github.com/hisilicon/linux-hisi into next/soc
Pull "ARM64: hisilicon: defconfig updates for 4.15" from Wei Xu:
- Enable DRM_HISI_HIBMC for the D03/D05 board
* tag 'hisi-defconfig-for-4.15' of git://github.com/hisilicon/linux-hisi:
arm64: defconfig: Enable hisilicon hibmc drm driver
Diffstat (limited to 'arch/arm64/configs')
| -rw-r--r-- | arch/arm64/configs/defconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index 0725086ed6a3..f137a48ea443 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -392,6 +392,7 @@ CONFIG_DRM_TEGRA=m CONFIG_DRM_PANEL_SIMPLE=m CONFIG_DRM_I2C_ADV7511=m CONFIG_DRM_VC4=m +CONFIG_DRM_HISI_HIBMC=m CONFIG_DRM_HISI_KIRIN=m CONFIG_DRM_MESON=m CONFIG_FB=y |