diff --git a/config-arm-generic b/config-arm-generic
index e4e705670..bae4c1640 100644
--- a/config-arm-generic
+++ b/config-arm-generic
@@ -198,6 +198,7 @@ CONFIG_PCI_TEGRA=y
 CONFIG_AHCI_TEGRA=m
 CONFIG_MMC_SDHCI_TEGRA=m
 CONFIG_TEGRA_WATCHDOG=m
+CONFIG_GPIO_TEGRA=y
 CONFIG_I2C_TEGRA=m
 CONFIG_SPI_TEGRA114=m
 CONFIG_PWM_TEGRA=m
diff --git a/config-arm64 b/config-arm64
index 5ec79ca83..591a60a06 100644
--- a/config-arm64
+++ b/config-arm64
@@ -183,8 +183,7 @@ CONFIG_MFD_MAX77620=y
 CONFIG_PINCTRL_MAX77620=m
 CONFIG_REGULATOR_MAX77620=m
 CONFIG_GPIO_MAX77620=m
-# CONFIG_GPIO_TEGRA is not set
-# CONFIG_TEGRA_ACONNECT is not set
+CONFIG_TEGRA_ACONNECT=y
 
 # AllWinner
 CONFIG_MACH_SUN50I=y
diff --git a/config-armv7-generic b/config-armv7-generic
index 9a407c349..a8f26d36d 100644
--- a/config-armv7-generic
+++ b/config-armv7-generic
@@ -390,7 +390,6 @@ CONFIG_SND_SOC_TEGRA_RT5677=m
 CONFIG_AD525X_DPOT=m
 CONFIG_AD525X_DPOT_I2C=m
 CONFIG_AD525X_DPOT_SPI=m
-# CONFIG_GPIO_TEGRA is not set
 
 # Jetson TK1
 CONFIG_PINCTRL_AS3722=y
diff --git a/kernel.spec b/kernel.spec
index 6b9feca3f..03304be08 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2145,6 +2145,9 @@ fi
 #
 #
 %changelog
+* Fri Aug 19 2016 Peter Robinson <pbrobinson@fedoraproject.org>
+- Minor Tegra changes
+
 * Wed Aug 17 2016 Justin M. Forbes <jforbes@fedoraproject.org> - 4.8.0-0.rc2.git2.1
 - Linux v4.8-rc2-42-g5ff132c
 - CVE-2016-6828 tcp fix use after free in tcp_xmit_retransmit_queue (rhbz 1367091 1367092)