diff --git a/config-armv7 b/config-armv7 index 930365fe1..0ad00f2b7 100644 --- a/config-armv7 +++ b/config-armv7 @@ -384,6 +384,7 @@ CONFIG_SND_SOC_IMX_SPDIF=m CONFIG_USB_EHCI_MXC=m CONFIG_USB_IMX21_HCD=m CONFIG_USB_MXS_PHY=m +CONFIG_MMC_DW_SOCFPGA=m CONFIG_MMC_SDHCI_ESDHC_IMX=m CONFIG_MMC_MXC=m CONFIG_SPI_MXS=m diff --git a/config-armv7-generic b/config-armv7-generic index 0b0a3a765..a89644a22 100644 --- a/config-armv7-generic +++ b/config-armv7-generic @@ -269,7 +269,7 @@ CONFIG_MMC_DW_PLTFM=m CONFIG_MMC_DW_PCI=m CONFIG_SPI_DW_MMIO=m CONFIG_SPI_DW_PCI=m -CONFIG_MMC_DW_SOCFPGA=m +# CONFIG_MMC_DW_SOCFPGA is not set # CONFIG_MMC_DW_EXYNOS is not set # CONFIG_MMC_DW_IDMAC is not set CONFIG_USB_DWC2=m diff --git a/kernel.spec b/kernel.spec index 0f5e9fe6f..912bb8e18 100644 --- a/kernel.spec +++ b/kernel.spec @@ -2252,6 +2252,9 @@ fi # ||----w | # || || %changelog +* Tue Oct 8 2013 Peter Robinson +- Tiny ARM config update + * Tue Oct 08 2013 Josh Boyer - 3.12.0-0.rc4.git1.1 - Linux v3.12-rc4-19-g8b5ede6 - Reenable debugging options.