diff options
| author | Peter Robinson <pbrobinson@gmail.com> | 2016-11-20 15:21:07 +0000 |
|---|---|---|
| committer | Peter Robinson <pbrobinson@gmail.com> | 2016-11-20 15:21:07 +0000 |
| commit | f94c0952d6a6a5bfc0be922fc34c5f69868c5184 (patch) | |
| tree | 113423e6e3b88263b309366e64fa6e760f575d8a | |
| parent | d77dbf13d450a20d62cab279080efff3d2c124ee (diff) | |
| download | kernel-f94c0952d6a6a5bfc0be922fc34c5f69868c5184.tar.gz kernel-f94c0952d6a6a5bfc0be922fc34c5f69868c5184.tar.xz kernel-f94c0952d6a6a5bfc0be922fc34c5f69868c5184.zip | |
Minor ARM config tweaks
| -rw-r--r-- | config-arm-generic | 3 | ||||
| -rw-r--r-- | config-armv7 | 1 | ||||
| -rw-r--r-- | config-armv7-generic | 7 | ||||
| -rw-r--r-- | kernel.spec | 3 |
4 files changed, 12 insertions, 2 deletions
diff --git a/config-arm-generic b/config-arm-generic index a851da49f..ba316f27f 100644 --- a/config-arm-generic +++ b/config-arm-generic @@ -170,6 +170,7 @@ CONFIG_SERIAL_MVEBU_CONSOLE=y CONFIG_MVEBU_DEVBUS=y CONFIG_MVEBU_MBUS=y CONFIG_PCI_MVEBU=y +CONFIG_PCI_AARDVARK=y CONFIG_PCIE_ARMADA_8K=y CONFIG_MV_XOR=y CONFIG_CRYPTO_DEV_MV_CESA=m @@ -195,9 +196,9 @@ CONFIG_USB_MV_UDC=m CONFIG_USB_XHCI_MVEBU=m CONFIG_PHY_MVEBU_SATA=y CONFIG_AHCI_MVEBU=m +CONFIG_I2C_PXA=m # CONFIG_CACHE_FEROCEON_L2 is not set # CONFIG_CACHE_FEROCEON_L2_WRITETHROUGH is not set -# CONFIG_PCI_AARDVARK is not set # Rockchips CONFIG_ARCH_ROCKCHIP=y diff --git a/config-armv7 b/config-armv7 index 0207f9ab9..55f188c22 100644 --- a/config-armv7 +++ b/config-armv7 @@ -518,7 +518,6 @@ CONFIG_MACH_MMP2_DT=y CONFIG_SERIAL_PXA=y CONFIG_SERIAL_PXA_CONSOLE=y CONFIG_KEYBOARD_PXA27x=y -CONFIG_I2C_PXA=m # CONFIG_I2C_PXA_SLAVE is not set CONFIG_SND_MMP_SOC=y CONFIG_SND_PXA910_SOC=m diff --git a/config-armv7-generic b/config-armv7-generic index 90d3ecd8a..47918a98b 100644 --- a/config-armv7-generic +++ b/config-armv7-generic @@ -330,6 +330,9 @@ CONFIG_SND_SOC_SAMSUNG_SMDK_SPDIF=m CONFIG_SND_SOC_SAMSUNG_SMDK_WM8994=m CONFIG_SND_SOC_SMDK_WM8994_PCM=m CONFIG_SND_SOC_SNOW=m +CONFIG_SND_SOC_MAX98090=m +CONFIG_SND_SOC_MAX98095=m +CONFIG_SND_SAMSUNG_I2S=m CONFIG_SND_SOC_ODROIDX2=m CONFIG_EXYNOS_AUDSS_CLK_CON=m # CONFIG_EXYNOS_IOMMU_DEBUG is not set @@ -351,6 +354,8 @@ CONFIG_CHARGER_MAX8997=m CONFIG_LEDS_MAX8997=m CONFIG_RTC_DRV_MAX8997=m CONFIG_EXTCON_MAX8997=m +CONFIG_SND_SOC_ARNDALE_RT5631_ALC5631=m +CONFIG_SND_SOC_RT5631=m # Tegra CONFIG_ARCH_TEGRA_114_SOC=y @@ -401,9 +406,11 @@ CONFIG_USB_EHCI_HCD_ORION=m CONFIG_MVPP2=m CONFIG_COMMON_CLK_SI5351=m CONFIG_RTC_DRV_ARMADA38X=m +CONFIG_I2C_PXA=m # CONFIG_CACHE_FEROCEON_L2 is not set # CONFIG_CACHE_FEROCEON_L2_WRITETHROUGH is not set CONFIG_LEDS_NS2=m +CONFIG_LEDS_PCA963X=m # CONFIG_PCIE_ARMADA_8K is not set # DRM panels diff --git a/kernel.spec b/kernel.spec index c8dfbfa5e..026af5445 100644 --- a/kernel.spec +++ b/kernel.spec @@ -2185,6 +2185,9 @@ fi # # %changelog +* Sun Nov 20 2016 Peter Robinson <pbrobinson@fedoraproject.org> +- Minor ARM config tweaks + * Tue Nov 15 2016 Justin M. Forbes <jforbes@fedoraproject.org> - 4.8.8-300 - Linux v4.8.8 - Fix crash in tcp_collapse CVE-2016-8645 (rhbz 1393904 1393908) |