diff --git a/[refs] b/[refs]
index 1b870e90e84f..2818d93a2c07 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2c51a4bc0233487db81706a0189715a59b18e9d6
+refs/heads/master: 8694a1840c71fc7835595ee69139c83f7a8e5543
diff --git a/trunk/arch/alpha/Kconfig b/trunk/arch/alpha/Kconfig
index 60cde53d266c..8bb936226dee 100644
--- a/trunk/arch/alpha/Kconfig
+++ b/trunk/arch/alpha/Kconfig
@@ -51,7 +51,7 @@ config GENERIC_CMOS_UPDATE
         def_bool y
 
 config GENERIC_GPIO
-	def_bool y
+	bool
 
 config ZONE_DMA
 	bool