[Gc-linux-cvs] linux/include/linux fb.h, 1.32, 1.33 gpio.h, 1.2, 1.3 i2c-gpio.h, 1.2, 1.3

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

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

Modified Files:
	fb.h gpio.h i2c-gpio.h 
Log Message:
Rewind to v2.6.29.


Index: i2c-gpio.h
===================================================================
RCS file: /cvsroot/gc-linux/linux/include/linux/i2c-gpio.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** i2c-gpio.h	2 Mar 2009 18:36:16 -0000	1.2
--- i2c-gpio.h	25 Oct 2009 18:33:47 -0000	1.3
***************
*** 34,38 ****
  	unsigned int	scl_is_open_drain:1;
  	unsigned int	scl_is_output_only:1;
- 	unsigned int	sda_enforce_dir:1;
  };
  
--- 34,37 ----

Index: gpio.h
===================================================================
RCS file: /cvsroot/gc-linux/linux/include/linux/gpio.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** gpio.h	2 Mar 2009 18:34:00 -0000	1.2
--- gpio.h	25 Oct 2009 18:33:47 -0000	1.3
***************
*** 50,58 ****
  }
  
- static inline int gpio_direction_is_output(unsigned gpio)
- {
- 	return -EINVAL;
- }
- 
  static inline int gpio_get_value(unsigned gpio)
  {
--- 50,53 ----

Index: fb.h
===================================================================
RCS file: /cvsroot/gc-linux/linux/include/linux/fb.h,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** fb.h	2 Mar 2009 19:26:38 -0000	1.32
--- fb.h	25 Oct 2009 18:33:47 -0000	1.33
***************
*** 39,47 ****
  #define FBIOGET_DISPINFO        0x4618
  
- #define FBIOWAITRETRACE         0x4619
- #define FBIOWAITPEFINISH        0x4620
- #define FBIOVIRTTOPHYS          0x4621
- #define FBIOFLIP                0x4622
- #define FBIOFLIPHACK            0x4623 /* libsdl */
  
  #define FB_TYPE_PACKED_PIXELS		0	/* Packed Pixels	*/
--- 39,42 ----
***************
*** 902,912 ****
  #define fb_writeb __raw_writeb
  #define fb_writew __raw_writew
! #ifndef CONFIG_FB_GAMECUBE	/* XXX Why? O' why? */
! #  define fb_writel __raw_writel
! #else
!    extern unsigned int vifb_writel(unsigned int, void *);
! #  define fb_writel(b, addr) vifb_writel(b, addr)
! #  define fb_writel_real(b, addr) (*(/*volatile*/ u32 __iomem *)(addr) = (b))
! #endif
  #define fb_writeq __raw_writeq
  #define fb_memset memset_io
--- 897,901 ----
  #define fb_writeb __raw_writeb
  #define fb_writew __raw_writew
! #define fb_writel __raw_writel
  #define fb_writeq __raw_writeq
  #define fb_memset memset_io