diff options
| -rw-r--r-- | config-armv7 | 3 | ||||
| -rw-r--r-- | config-armv7-generic | 3 | ||||
| -rw-r--r-- | kernel.spec | 3 |
3 files changed, 7 insertions, 2 deletions
diff --git a/config-armv7 b/config-armv7 index 4d0823de5..1bbb3d524 100644 --- a/config-armv7 +++ b/config-armv7 @@ -210,7 +210,7 @@ CONFIG_MTD_NAND_OMAP2=y CONFIG_MTD_NAND_OMAP_PREFETCH=y CONFIG_MTD_NAND_OMAP_PREFETCH_DMA=y CONFIG_SPI_DAVINCI=m -CONFIG_SPI_OMAP24XX=y +CONFIG_SPI_OMAP24XX=m CONFIG_MFD_TI_SSP=m CONFIG_SPI_TI_SSP=m @@ -402,6 +402,7 @@ CONFIG_USB_IMX21_HCD=m CONFIG_USB_MXS_PHY=m CONFIG_MMC_SDHCI_ESDHC_IMX=m CONFIG_MMC_MXC=m +CONFIG_SPI_MXS=m CONFIG_RTC_DRV_IMXDI=m CONFIG_RTC_DRV_MXC=m # CONFIG_MX3_IPU is not set diff --git a/config-armv7-generic b/config-armv7-generic index 5e7e97884..ff4acebef 100644 --- a/config-armv7-generic +++ b/config-armv7-generic @@ -165,6 +165,7 @@ CONFIG_SERIAL_AMBA_PL010_CONSOLE=y CONFIG_SERIAL_AMBA_PL011=y CONFIG_SERIAL_AMBA_PL011_CONSOLE=y CONFIG_SERIAL_8250_DW=y +CONFIG_SERIAL_MRST_MAX3110=m CONFIG_RTC_DRV_PL030=y CONFIG_RTC_DRV_PL031=y @@ -285,6 +286,7 @@ CONFIG_MMC_DW=m CONFIG_MMC_DW_PLTFM=m CONFIG_MMC_DW_PCI=m CONFIG_SPI_DW_MMIO=m +CONFIG_SPI_DW_PCI=m # CONFIG_MMC_DW_EXYNOS is not set # CONFIG_MMC_DW_IDMAC is not set @@ -470,7 +472,6 @@ CONFIG_PERF_EVENTS=y # CONFIG_SERIAL_IFX6X60 is not set # CONFIG_COMMON_CLK_SI5351 is not set # CONFIG_COMMON_CLK_AXI_CLKGEN is not set -# CONFIG_SPI_DW_PCI is not set # CONFIG_SPI_TOPCLIFF_PCH is not set # CONFIG_SPI_PXA2XX is not set diff --git a/kernel.spec b/kernel.spec index 907295c32..09b547226 100644 --- a/kernel.spec +++ b/kernel.spec @@ -2283,6 +2283,9 @@ fi # ||----w | # || || %changelog +* Wed Jun 12 2013 Peter Robinson <pbrobinson@fedoraproject.org> +- Minor ARM config updates + * Wed Jun 12 2013 Kyle McMartin <kmcmarti@redhat.com> - Merge %{with_pae} and %{with_lpae} so both ARM and i686 use the same flavours. Set %{pae} to the flavour name {lpae, PAE}. Merging |