diff --git a/config-arm64 b/config-arm64 index 6f9c75a..710b466 100644 --- a/config-arm64 +++ b/config-arm64 @@ -145,6 +145,7 @@ CONFIG_AMD_XGBE_PHY=m # HiSilicon CONFIG_POWER_RESET_HISI=y CONFIG_HISI_THERMAL=m +CONFIG_STUB_CLK_HI6220=y # ThunderX # CONFIG_MDIO_OCTEON is not set diff --git a/config-armv7 b/config-armv7 index 0bab6e1..7c81e1d 100644 --- a/config-armv7 +++ b/config-armv7 @@ -340,6 +340,10 @@ CONFIG_PHY_QCOM_UFS=m CONFIG_HWSPINLOCK_QCOM=m CONFIG_QCOM_COINCELL=m CONFIG_USB_QCOM_8X16_PHY=m +CONFIG_QCOM_SMD=m +CONFIG_QCOM_SMD_RPM=m +CONFIG_QCOM_SMEM=m +CONFIG_REGULATOR_QCOM_SMD_RPM=m # CONFIG_QCOM_SMEM is not set # i.MX diff --git a/config-armv7-generic b/config-armv7-generic index 8c380fe..60913e0 100644 --- a/config-armv7-generic +++ b/config-armv7-generic @@ -355,6 +355,7 @@ CONFIG_PHY_ROCKCHIP_USB=m CONFIG_DWMAC_ROCKCHIP=m CONFIG_SND_SOC_ROCKCHIP_MAX98090=m CONFIG_SND_SOC_ROCKCHIP_RT5645=m +CONFIG_REGULATOR_ACT8865=m # Tegra CONFIG_ARCH_TEGRA_114_SOC=y diff --git a/kernel.spec b/kernel.spec index bba4af4..eb5491e 100644 --- a/kernel.spec +++ b/kernel.spec @@ -2038,6 +2038,9 @@ fi # # %changelog +* Mon Sep 28 2015 Peter Robinson +- Minor ARMv7 updates + * Thu Sep 24 2015 Josh Boyer - CVE-2015-5257 Null ptr deref in usb whiteheat driver (rhbz 1265607 1265612)