diff --git a/[refs] b/[refs]
index 54304c00a690..351265b4f6d2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7faaa5f0bf4db6ac4908038e2139adc46c165ff4
+refs/heads/master: 32993b793fb07784fd1380004f5b34f31f9105d5
diff --git a/trunk/Documentation/gpio.txt b/trunk/Documentation/gpio.txt
index f8528db967fa..e8be0abb346c 100644
--- a/trunk/Documentation/gpio.txt
+++ b/trunk/Documentation/gpio.txt
@@ -66,7 +66,9 @@ registers; another might implement it by delegating through abstractions
 used for several very different kinds of GPIO controller.
 
 That said, if the convention is supported on their platform, drivers should
-use it when possible:
+use it when possible.  Platforms should declare GENERIC_GPIO support in
+Kconfig (boolean true), which multi-platform drivers can depend on when
+using the include file:
 
 	#include <asm/gpio.h>