diff options
| -rw-r--r-- | config-armv7 | 14 | ||||
| -rw-r--r-- | config-generic | 1 | ||||
| -rw-r--r-- | kernel.spec | 4 |
3 files changed, 11 insertions, 8 deletions
diff --git a/config-armv7 b/config-armv7 index 8b1fd0a17..c148a6708 100644 --- a/config-armv7 +++ b/config-armv7 @@ -538,10 +538,6 @@ CONFIG_SND_SOC_TEGRA20_AC97=m CONFIG_SND_SOC_TEGRA30_AHUB=m CONFIG_SND_SOC_TEGRA30_I2S=m -# bool only, upstream aiming for modular in 3.14 -# https://lkml.org/lkml/2013/11/18/47 -# CONFIG_DRM_TEGRA is not set - # AC100 (PAZ00) CONFIG_MFD_NVEC=y CONFIG_MFD_TPS80031=y @@ -559,10 +555,13 @@ CONFIG_PWM_TEGRA=m CONFIG_TEGRA_HOST1X=m CONFIG_TEGRA_HOST1X_FIREWALL=y - -CONFIG_DRM_TEGRA=y -# CONFIG_DRM_TEGRA_STAGING is not set +CONFIG_DRM_TEGRA=m +# CONFIG_DRM_TEGRA_FBDEV is not set # CONFIG_DRM_TEGRA_DEBUG is not set +# CONFIG_DRM_TEGRA_STAGING is not set +CONFIG_DRM_PANEL=y +CONFIG_DRM_PANEL_SIMPLE=m + CONFIG_CRYPTO_DEV_TEGRA_AES=m @@ -585,6 +584,7 @@ CONFIG_XILINX_EMACLITE=m CONFIG_GPIO_XILINX=y CONFIG_I2C_XILINX=m CONFIG_SPI_XILINX=m +CONFIG_MMC_SDHCI_OF_ARASAN=m # Multi function devices CONFIG_MFD_88PM800=m diff --git a/config-generic b/config-generic index 2f24255a3..952efdf13 100644 --- a/config-generic +++ b/config-generic @@ -198,7 +198,6 @@ CONFIG_BINFMT_MISC=m # Device Drivers # -# CONFIG_COMMON_CLK_DEBUG is not set # CONFIG_COMMON_CLK_SI5351 is not set # diff --git a/kernel.spec b/kernel.spec index 51399830a..554dd6965 100644 --- a/kernel.spec +++ b/kernel.spec @@ -2061,6 +2061,10 @@ fi # ||----w | # || || %changelog +* Mon Feb 3 2014 Peter Robinson <pbrobinson@fedoraproject.org> +- Re-enable modular Tegra DRM driver +- Add SD driver for ZYNQ SoCs + * Fri Jan 31 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.14.0-0.rc0.git19.1 - Linux v3.13-10637-ge7651b8 - Enable ZRAM/ZSMALLOC (rhbz 1058072) |