[Gc-linux-cvs] linux/include/asm-generic gpio.h,1.3,1.4

[Albert H. <he...@us...>]

Update of /cvsroot/gc-linux/linux/include/asm-generic
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv29988/include/asm-generic

Modified Files:
	gpio.h 
Log Message:
Forward to v.2.6.30.


Index: gpio.h
===================================================================
RCS file: /cvsroot/gc-linux/linux/include/asm-generic/gpio.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** gpio.h	25 Oct 2009 18:33:47 -0000	1.3
--- gpio.h	25 Oct 2009 18:45:36 -0000	1.4
***************
*** 56,59 ****
--- 56,63 ----
   * @can_sleep: flag must be set iff get()/set() methods sleep, as they
   *	must while accessing GPIO expander chips over I2C or SPI
+  * @names: if set, must be an array of strings to use as alternative
+  *      names for the GPIOs in this chip. Any entry in the array
+  *      may be NULL if there is no alias for the GPIO, however the
+  *      array must be @ngpio entries long.
   *
   * A gpio_chip can help platforms abstract various sources of GPIOs so
***************
*** 93,96 ****
--- 97,101 ----
  	int			base;
  	u16			ngpio;
+ 	char			**names;
  	unsigned		can_sleep:1;
  	unsigned		exported:1;