diff options
| author | Josh Boyer <jwboyer@fedoraproject.org> | 2015-02-17 10:18:24 -0500 |
|---|---|---|
| committer | Josh Boyer <jwboyer@fedoraproject.org> | 2015-02-17 10:18:24 -0500 |
| commit | 08f431fa3ad32081c754b2ba5346eb1337a63b89 (patch) | |
| tree | 031cba201cd5612ec8a1a64a38d7ee1e73a7030d /config-armv7-generic | |
| parent | c438599162b0da1365ac1ea1a03e16586fc47e77 (diff) | |
| download | kernel-08f431fa3ad32081c754b2ba5346eb1337a63b89.tar.gz kernel-08f431fa3ad32081c754b2ba5346eb1337a63b89.tar.xz kernel-08f431fa3ad32081c754b2ba5346eb1337a63b89.zip | |
Linux v3.19-7478-g796e1c55717e
- DRM merge
Diffstat (limited to 'config-armv7-generic')
| -rw-r--r-- | config-armv7-generic | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/config-armv7-generic b/config-armv7-generic index bce46b2a5..d42da64d5 100644 --- a/config-armv7-generic +++ b/config-armv7-generic @@ -271,6 +271,7 @@ CONFIG_DRM_EXYNOS_DPI=y CONFIG_DRM_EXYNOS_DSI=y CONFIG_DRM_EXYNOS_FIMC=y CONFIG_DRM_EXYNOS_FIMD=y +CONFIG_DRM_EXYNOS7_DECON=y CONFIG_DRM_EXYNOS_G2D=y CONFIG_DRM_EXYNOS_GSC=y CONFIG_DRM_EXYNOS_HDMI=y @@ -341,6 +342,7 @@ CONFIG_SND_SOC_ROCKCHIP=m CONFIG_SND_SOC_ROCKCHIP_I2S=m CONFIG_ROCKCHIP_THERMAL=m CONFIG_DRM_ROCKCHIP=m +CONFIG_ROCKCHIP_DW_HDMI=m CONFIG_PHY_ROCKCHIP_USB=m # Tegra @@ -376,7 +378,7 @@ CONFIG_DRM_TEGRA=m CONFIG_DRM_TEGRA_FBDEV=y # CONFIG_DRM_TEGRA_DEBUG is not set CONFIG_DRM_TEGRA_STAGING=y -CONFIG_NOUVEAU_PLATFORM_DRIVER=m +CONFIG_NOUVEAU_PLATFORM_DRIVER=y CONFIG_AD525X_DPOT=m CONFIG_AD525X_DPOT_I2C=m CONFIG_AD525X_DPOT_SPI=m |