summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Robinson <pbrobinson@gmail.com>2014-07-21 13:41:52 +0100
committerPeter Robinson <pbrobinson@gmail.com>2014-07-21 13:41:52 +0100
commitac6522333e707a158dc14aac3a24c2f7c1ebbc39 (patch)
treec401e779401e427526878adc4dd2186631cb920d
parent8a5a68f85e4a6cfc5675332f25d215562722493a (diff)
downloadkernel-ac6522333e707a158dc14aac3a24c2f7c1ebbc39.tar.gz
kernel-ac6522333e707a158dc14aac3a24c2f7c1ebbc39.tar.xz
kernel-ac6522333e707a158dc14aac3a24c2f7c1ebbc39.zip
Minor ARMv7 config update
-rw-r--r--config-armv76
-rw-r--r--kernel.spec3
2 files changed, 6 insertions, 3 deletions
diff --git a/config-armv7 b/config-armv7
index 5b4b2ab42..6dd7ced4e 100644
--- a/config-armv7
+++ b/config-armv7
@@ -316,7 +316,7 @@ CONFIG_OMAP_REMOTEPROC=m
# CONFIG_OMAP_MUX_DEBUG is not set
# CONFIG_VIDEO_OMAP3_DEBUG is not set
-# AM33xx
+# AM33xx/43xx
CONFIG_SOC_AM33XX=y
CONFIG_SOC_AM43XX=y
CONFIG_AM335X_CONTROL_USB=m
@@ -348,8 +348,8 @@ CONFIG_REGULATOR_TI_ABB=m
CONFIG_TI_ADC081C=m
CONFIG_TI_AM335X_ADC=m
CONFIG_PWM_TIPWMSS=y
-# CONFIG_GPIO_DAVINCI is not set
-# CONFIG_DAVINCI_WATCHDOG is not set
+CONFIG_MFD_TPS65218=m
+CONFIG_REGULATOR_TPS65218=m
# QCom
CONFIG_ARCH_MSM8X60=y
diff --git a/kernel.spec b/kernel.spec
index 02244c5a1..f770df39c 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2246,6 +2246,9 @@ fi
# ||----w |
# || ||
%changelog
+* Mon Jul 21 2014 Peter Robinson <pbrobinson@fedoraproject.org>
+- Minor ARMv7 config update
+
* Thu Jul 17 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.16.0-0.rc5.git2.1
- Linux v3.16-rc5-143-gb6603fe574af