diff --git a/[refs] b/[refs]
index db060d7d5741..b3a456ddffb3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 161520451dfacd0eb79d501933f47d3fb7464938
+refs/heads/master: 79bc57463be2ad5020a53accbf26898e8ac04550
diff --git a/trunk/drivers/pps/clients/Kconfig b/trunk/drivers/pps/clients/Kconfig
index c2e0f1e97bcd..445197d4a8c4 100644
--- a/trunk/drivers/pps/clients/Kconfig
+++ b/trunk/drivers/pps/clients/Kconfig
@@ -31,7 +31,7 @@ config PPS_CLIENT_PARPORT
 
 config PPS_CLIENT_GPIO
 	tristate "PPS client using GPIO"
-	depends on PPS
+	depends on PPS && GENERIC_HARDIRQS
 	help
 	  If you say yes here you get support for a PPS source using
 	  GPIO. To be useful you must also register a platform device