4 files changed, 9 insertions, 3 deletions
diff --git a/config-armv7 b/config-armv7
index 2803a067e..294a0a556 100644
--- a/config-armv7
+++ b/config-armv7
@@ -355,6 +355,7 @@ CONFIG_REGULATOR_QCOM_SMD_RPM=m
 CONFIG_SOC_IMX50=y
 CONFIG_SOC_IMX51=y
 CONFIG_SOC_IMX53=y
+CONFIG_SOC_IMX6=y
 CONFIG_SOC_IMX6Q=y
 CONFIG_SOC_IMX6SL=y
 CONFIG_SOC_IMX6SX=y
diff --git a/config-armv7-generic b/config-armv7-generic
index ea5b26e31..b71b55e83 100644
--- a/config-armv7-generic
+++ b/config-armv7-generic
@@ -746,9 +746,11 @@ CONFIG_TMP006=m
 CONFIG_BMP085=y
 CONFIG_BMP085_I2C=m
 CONFIG_BMP085_SPI=m
+CONFIG_BMP280=m
 CONFIG_SENSORS_AD7314=m
 CONFIG_SENSORS_ADCXX=m
 CONFIG_SENSORS_ADS7871=m
+CONFIG_SENSORS_BH1780=m
 CONFIG_SENSORS_GPIO_FAN=m
 CONFIG_SENSORS_HTU21=m
 CONFIG_SENSORS_ISL29018=m
@@ -756,6 +758,7 @@ CONFIG_SENSORS_ISL29028=m
 CONFIG_SENSORS_LIS3_SPI=m
 CONFIG_SENSORS_LM70=m
 CONFIG_SENSORS_MAX1111=m
+CONFIG_MPL115=m
 CONFIG_MPL3115=m
 CONFIG_DHT11=m
 CONFIG_SI7005=m
@@ -829,9 +832,6 @@ CONFIG_UBIFS_FS_ADVANCED_COMPR=y
 CONFIG_UBIFS_FS_LZO=y
 CONFIG_UBIFS_FS_ZLIB=y
 
-# Sensors
-CONFIG_SENSORS_HTU21=m
-
 # Chromebook
 CONFIG_MFD_CROS_EC=m
 CONFIG_MFD_CROS_EC_I2C=m
diff --git a/config-powerpc64-generic b/config-powerpc64-generic
index 58fbee841..13d546190 100644
--- a/config-powerpc64-generic
+++ b/config-powerpc64-generic
@@ -166,6 +166,7 @@ CONFIG_SCSI_IPR_TRACE=y
 CONFIG_SCSI_IPR_DUMP=y
 
 CONFIG_SERIAL_ICOM=m
+# CONFIG_SERIAL_8250 is not set
 
 # Things we might want to review for newer architectures
 # CONFIG_PCIEPORTBUS is not set
diff --git a/kernel.spec b/kernel.spec
index f0cea264c..211cdd085 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2036,6 +2036,10 @@ fi
 #
 # 
 %changelog
+* Tue Nov 10 2015 Peter Robinson <pbrobinson@fedoraproject.org>
+- Don't build Serial 8250 on ppc platforms (fix FBTFS)
+- Enable some more common sensors on ARMv7
+
 * Mon Nov 09 2015 Laura Abbott <labbott@redhat.com> - 4.4.0-0.rc0.git5.1
 - Linux v4.3-9269-gce5c2d2