Index: include/target.mk
===================================================================
--- include/target.mk	(revision 10831)
+++ include/target.mk	(working copy)
@@ -126,6 +126,9 @@
     .SILENT: $(TMP_CONFIG)
     .PRECIOUS: $(TMP_CONFIG)
 
+    ifneq ($(CONFIG_GENERIC_GPIO),)
+      FEATURES += gpio
+    endif
     ifneq ($(CONFIG_PCI),)
       FEATURES += pci
     endif
Index: scripts/metadata.pl
===================================================================
--- scripts/metadata.pl	(revision 10831)
+++ scripts/metadata.pl	(working copy)
@@ -152,6 +152,7 @@
 	while ($_ = shift @_) {
 		/broken/ and $ret .= "\tdepends BROKEN\n";
 		/display/ and $ret .= "\tselect DISPLAY_SUPPORT\n";
+		/gpio/ and $ret .= "\tselect GPIO_SUPPORT\n";
 		/pci/ and $ret .= "\tselect PCI_SUPPORT\n";
 		/usb/ and $ret .= "\tselect USB_SUPPORT\n";
 		/pcmcia/ and $ret .= "\tselect PCMCIA_SUPPORT\n";
Index: target/Config.in
===================================================================
--- target/Config.in	(revision 10831)
+++ target/Config.in	(working copy)
@@ -11,6 +11,9 @@
 config DISPLAY_SUPPORT
 	bool
 
+config GPIO_SUPPORT
+	bool
+
 config PCI_SUPPORT
 	bool