diff --git a/[refs] b/[refs]
index 09487322d787..f368685c9c63 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1b60e77d8485841cf6278963b151a486fbae1445
+refs/heads/master: 954886987085072cd7dd06622ddf850e46ec2902
diff --git a/trunk/arch/ia64/Kconfig b/trunk/arch/ia64/Kconfig
index 124854714958..aaaee506499f 100644
--- a/trunk/arch/ia64/Kconfig
+++ b/trunk/arch/ia64/Kconfig
@@ -92,7 +92,7 @@ config HAVE_SETUP_PER_CPU_AREA
 	def_bool y
 
 config GENERIC_GPIO
-	def_bool y
+	bool
 
 config DMI
 	bool