summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Robinson <pbrobinson@gmail.com>2015-09-28 07:19:08 +0100
committerPeter Robinson <pbrobinson@gmail.com>2015-09-28 07:19:08 +0100
commit8b4bb52cfd57c8999cfb991718216c9eb75cd1b1 (patch)
tree2f46f97d2a03430438f640aadb93ddc64f3041d6
parent30bd47d7678036fc0061ba5810b9b3e50600d184 (diff)
downloadkernel-8b4bb52cfd57c8999cfb991718216c9eb75cd1b1.tar.gz
kernel-8b4bb52cfd57c8999cfb991718216c9eb75cd1b1.tar.xz
kernel-8b4bb52cfd57c8999cfb991718216c9eb75cd1b1.zip
Minor ARMv7 updates
-rw-r--r--config-arm641
-rw-r--r--config-armv74
-rw-r--r--config-armv7-generic1
-rw-r--r--kernel.spec3
4 files changed, 9 insertions, 0 deletions
diff --git a/config-arm64 b/config-arm64
index 6f9c75a74..710b466e3 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 0bab6e118..7c81e1d70 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 8c380fef1..60913e089 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 bba4af47a..eb5491e99 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2038,6 +2038,9 @@ fi
#
#
%changelog
+* Mon Sep 28 2015 Peter Robinson <pbrobinson@fedoraproject.org>
+- Minor ARMv7 updates
+
* Thu Sep 24 2015 Josh Boyer <jwboyer@fedoraproject.org>
- CVE-2015-5257 Null ptr deref in usb whiteheat driver (rhbz 1265607 1265612)