---

yaml
---
r: 251971
b: refs/heads/master
c: e849dc0
h: refs/heads/master
i:
  251969: 5ab4f84
  251967: 5b15a4b
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3f397c2144e46d9127662fdb6314f21960d8563d
+refs/heads/master: e849dc044af0939135c822833092bc9baf480222

trunk/drivers/gpio/Kconfig

@@ -1,5 +1,5 @@
 #
-# platform-neutral GPIO infrastructure and expanders
+# GPIO infrastructure and drivers
 #
 
 config ARCH_WANT_OPTIONAL_GPIOLIB
@@ -31,7 +31,7 @@ menuconfig GPIOLIB
 	help
 	  This enables GPIO support through the generic GPIO library.
 	  You only need to enable this, if you also want to enable
-	  one or more of the GPIO expansion card drivers below.
+	  one or more of the GPIO drivers below.
 
 	  If unsure, say N.
 
@@ -63,12 +63,12 @@ config GPIO_SYSFS
 	  Kernel drivers may also request that a particular GPIO be
 	  exported to userspace; this can be useful when debugging.
 
-# put expanders in the right section, in alphabetical order
+# put drivers in the right section, in alphabetical order
 
 config GPIO_MAX730X
 	tristate
 
-comment "Memory mapped GPIO expanders:"
+comment "Memory mapped GPIO drivers:"
 
 config GPIO_BASIC_MMIO
 	tristate "Basic memory-mapped GPIO controllers support"

trunk/drivers/gpio/Makefile

@@ -1,8 +1,4 @@
-# generic gpio support: dedicated expander chips, etc
-#
-# NOTE: platform-specific GPIO drivers don't belong in the
-# drivers/gpio directory; put them with other platform setup
-# code, IRQ controllers, board init, etc.
+# generic gpio support: platform drivers, dedicated expander chips, etc
 
 ccflags-$(CONFIG_DEBUG_GPIO)	+= -DDEBUG