diff --git a/Documentation/ABI/testing/sysfs-gpio b/Documentation/ABI/obsolete/sysfs-gpio
similarity index 88%
rename from Documentation/ABI/testing/sysfs-gpio
rename to Documentation/ABI/obsolete/sysfs-gpio
index 55ffa2df1c10225ee01c38a7fb41334cd949286f..867c1fab20e243f224f68bd2ddeacd4eef7dda4d 100644
--- a/Documentation/ABI/testing/sysfs-gpio
+++ b/Documentation/ABI/obsolete/sysfs-gpio
@@ -1,7 +1,7 @@
 What:		/sys/class/gpio/
 Date:		July 2008
 KernelVersion:	2.6.27
-Contact:	David Brownell <dbrownell@users.sourceforge.net>
+Contact:	Linus Walleij <linusw@kernel.org>
 Description:
 
   As a Kconfig option, individual GPIO signals may be accessed from
@@ -26,3 +26,5 @@ Description:
 	    /label ... (r/o) descriptive, not necessarily unique
 	    /ngpio ... (r/o) number of GPIOs; numbered N to N + (ngpio - 1)
 
+  This ABI is deprecated and will be removed after 2020. It is
+  replaced with the GPIO character device.
diff --git a/MAINTAINERS b/MAINTAINERS
index a85cd6dcb5de511d5bdab71c26ea11771810d7e3..7df638be28e29e663ba345c53ac5033a7f8a7af3 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4816,6 +4816,7 @@ T:	git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git
 S:	Maintained
 F:	Documentation/gpio/
 F:	Documentation/ABI/testing/gpio-cdev
+F:	Documentation/ABI/obsolete/sysfs-gpio
 F:	drivers/gpio/
 F:	include/linux/gpio/
 F:	include/linux/gpio.h