diff --git a/[refs] b/[refs]
index c5bb6602ec8d..501b04ba5a4e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c7886b18273b07042e25e8d3ba5c983837b84123
+refs/heads/master: 9170100ee46402af6d318134525c728027318d67
diff --git a/trunk/arch/arm64/Kconfig b/trunk/arch/arm64/Kconfig
index f8f362aafee9..e9a8fe607918 100644
--- a/trunk/arch/arm64/Kconfig
+++ b/trunk/arch/arm64/Kconfig
@@ -1,6 +1,7 @@
 config ARM64
 	def_bool y
 	select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE
+	select ARCH_WANT_OPTIONAL_GPIOLIB
 	select ARCH_WANT_COMPAT_IPC_PARSE_VERSION
 	select ARM_AMBA
 	select CLONE_BACKWARDS
@@ -92,7 +93,7 @@ config IOMMU_HELPER
 	def_bool SWIOTLB
 
 config GENERIC_GPIO
-	def_bool y
+	bool
 
 source "init/Kconfig"