summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--config-armv714
-rw-r--r--config-armv7-generic3
-rw-r--r--kernel.spec3
3 files changed, 7 insertions, 13 deletions
diff --git a/config-armv7 b/config-armv7
index 0ac3a2f67..bec106c07 100644
--- a/config-armv7
+++ b/config-armv7
@@ -5,7 +5,6 @@
CONFIG_ARCH_MXC=y
CONFIG_ARCH_OMAP3=y
CONFIG_ARCH_OMAP4=y
-CONFIG_ARCH_PICOXCELL=y
CONFIG_ARCH_QCOM=y
CONFIG_ARCH_TEGRA=y
CONFIG_ARCH_U8500=y
@@ -22,7 +21,7 @@ CONFIG_ARCH_OMAP2PLUS_TYPICAL=y
CONFIG_SOC_OMAP5=y
# CONFIG_SOC_DRA7XX is not set
CONFIG_SOC_OMAP3430=y
-CONFIG_SOC_TI81XX=y
+# CONFIG_SOC_TI81XX is not set
# CONFIG_MACH_NOKIA_RX51 is not set
# CONFIG_MACH_OMAP_LDP is not set
# CONFIG_MACH_OMAP3517EVM is not set
@@ -545,17 +544,6 @@ CONFIG_SENSORS_AB8500=m
CONFIG_STE_MODEM_RPROC=m
CONFIG_STIH415_RESET=y
-CONFIG_IIO_ST_GYRO_I2C_3AXIS=m
-CONFIG_IIO_ST_GYRO_SPI_3AXIS=m
-CONFIG_IIO_ST_MAGN_I2C_3AXIS=m
-CONFIG_IIO_ST_MAGN_SPI_3AXIS=m
-CONFIG_IIO_ST_PRESS=m
-CONFIG_IIO_ST_PRESS_I2C=m
-CONFIG_IIO_ST_PRESS_SPI=m
-CONFIG_IIO_ST_SENSORS_I2C=m
-CONFIG_IIO_ST_SENSORS_SPI=m
-CONFIG_IIO_ST_SENSORS_CORE=m
-
# Allwinner
CONFIG_MACH_SUN4I=y
CONFIG_MACH_SUN5I=y
diff --git a/config-armv7-generic b/config-armv7-generic
index 12fd2c1f0..60866f873 100644
--- a/config-armv7-generic
+++ b/config-armv7-generic
@@ -759,6 +759,9 @@ CONFIG_SENSORS_LIS3_SPI=m
CONFIG_SENSORS_LM70=m
CONFIG_SENSORS_MAX1111=m
CONFIG_MPL3115=m
+CONFIG_DHT11=m
+CONFIG_SI7005=m
+CONFIG_SI7020=m
CONFIG_LCD_L4F00242T03=m
CONFIG_LCD_LMS283GF05=m
diff --git a/kernel.spec b/kernel.spec
index 6349048c4..278bd1940 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2042,6 +2042,9 @@ fi
#
#
%changelog
+* Wed Nov 4 2015 Peter Robinson <pbrobinson@fedoraproject.org>
+- Minor ARMv7 config updates
+
* Tue Nov 03 2015 Laura Abbott <labbott@redhat.com> - 4.4.0-0.rc0.git1.1
- Linux v4.3-272-g5062ecd
- Reenable debugging options.