diff --git a/config-arm-generic b/config-arm-generic
index 3daa40baa..132308800 100644
--- a/config-arm-generic
+++ b/config-arm-generic
@@ -331,7 +331,6 @@ CONFIG_OF_FLATTREE=y
 CONFIG_OF_GPIO=y
 CONFIG_OF_IOMMU=y
 CONFIG_OF_IRQ=y
-CONFIG_OF_MTD=y
 CONFIG_OF_NET=y
 CONFIG_OF_OVERLAY=y
 CONFIG_OF_PCI_IRQ=m
@@ -508,8 +507,6 @@ CONFIG_GPIO_GENERIC=m
 CONFIG_GPIO_GENERIC_PLATFORM=m
 CONFIG_GPIO_WATCHDOG=m
 CONFIG_GPIOLIB=y
-CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
-CONFIG_ARCH_REQUIRE_GPIOLIB=y
 CONFIG_BACKLIGHT_GPIO=m
 CONFIG_KEYBOARD_GPIO=m
 CONFIG_KEYBOARD_GPIO_POLLED=m
diff --git a/config-arm64 b/config-arm64
index 24f217834..07550faf0 100644
--- a/config-arm64
+++ b/config-arm64
@@ -47,7 +47,6 @@ CONFIG_ARM_SMMU_V3=y
 CONFIG_NR_CPUS=256
 
 CONFIG_ARCH_HAS_HOLES_MEMORYMODEL=y
-CONFIG_ARCH_REQUIRE_GPIOLIB=y
 CONFIG_ARM64_64K_PAGES=y
 
 CONFIG_ARM64_HW_AFDBM=y
@@ -61,6 +60,7 @@ CONFIG_ARM64_UAO=y
 # CONFIG_RANDOMIZE_BASE is not set
 
 CONFIG_ARM64_ACPI_PARKING_PROTOCOL=y
+CONFIG_ACPI_WATCHDOG=y
 
 CONFIG_BCMA_POSSIBLE=y
 CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
@@ -188,7 +188,7 @@ CONFIG_MFD_MAX77620=y
 CONFIG_PINCTRL_MAX77620=m
 CONFIG_REGULATOR_MAX77620=m
 CONFIG_GPIO_MAX77620=m
-CONFIG_TEGRA_ACONNECT=y
+CONFIG_TEGRA_ACONNECT=m
 
 # AllWinner
 CONFIG_SUNXI_RSB=m
diff --git a/config-armv7-generic b/config-armv7-generic
index fe2002a99..c9e4c6ce2 100644
--- a/config-armv7-generic
+++ b/config-armv7-generic
@@ -211,7 +211,7 @@ CONFIG_I2C_SUN6I_P2WI=m
 CONFIG_GPIO_PCF857X=m
 CONFIG_TOUCHSCREEN_SUN4I=m
 CONFIG_MFD_AXP20X=y
-CONFIG_MFD_AXP20X_I2C=m
+CONFIG_MFD_AXP20X_I2C=y
 CONFIG_MFD_AXP20X_RSB=m
 CONFIG_AXP20X_POWER=m
 CONFIG_INPUT_AXP20X_PEK=m
@@ -325,6 +325,7 @@ CONFIG_VIDEO_SAMSUNG_S5P_MFC=m
 # CONFIG_VIDEO_SAMSUNG_S5P_TV is not set
 CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC=m
 
+CONFIG_MFD_EXYNOS_LPASS=m
 CONFIG_SND_SOC_SAMSUNG=m
 CONFIG_SND_SOC_SAMSUNG_SMDK_SPDIF=m
 CONFIG_SND_SOC_SAMSUNG_SMDK_WM8994=m
@@ -403,8 +404,6 @@ CONFIG_RTC_DRV_ARMADA38X=m
 # CONFIG_CACHE_FEROCEON_L2 is not set
 # CONFIG_CACHE_FEROCEON_L2_WRITETHROUGH is not set
 CONFIG_LEDS_NS2=m
-CONFIG_SERIAL_MVEBU_UART=y
-# CONFIG_SERIAL_MVEBU_CONSOLE is not set
 # CONFIG_PCIE_ARMADA_8K is not set
 
 # DRM panels
diff --git a/kernel.spec b/kernel.spec
index daee49bdc..9de281337 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2142,6 +2142,9 @@ fi
 #
 #
 %changelog
+* Sat Oct 15 2016 Peter Robinson <pbrobinson@fedoraproject.org>
+- Minor ARM config cleanups
+
 * Fri Oct 14 2016 Laura Abbott <labbott@redhat.com> - 4.9.0-0.rc0.git9.1
 - Linux v4.8-14604-g29fbff8