[Gc-linux-cvs] linux/include/linux fb.h,1.31,1.32

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

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

Modified Files:
	fb.h 
Log Message:
Merge v2.6.29-rc6.

NOTE: Some of the Kconfig options and Makefile entries for the drivers
marked as "broken" will disappear with this commit.



Index: fb.h
===================================================================
RCS file: /cvsroot/gc-linux/linux/include/linux/fb.h,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** fb.h	1 Feb 2009 18:29:35 -0000	1.31
--- fb.h	2 Mar 2009 19:26:38 -0000	1.32
***************
*** 2,6 ****
  #define _LINUX_FB_H
  
! #include <asm/types.h>
  #include <linux/i2c.h>
  
--- 2,6 ----
  #define _LINUX_FB_H
  
! #include <linux/types.h>
  #include <linux/i2c.h>
  
***************
*** 894,898 ****
  #define fb_memset sbus_memset_io
  
! #elif defined(__i386__) || defined(__alpha__) || defined(__x86_64__) || defined(__hppa__) || (defined(__sh__) && !defined(__SH5__)) || defined(__powerpc__) || defined(__avr32__)
  
  #define fb_readb __raw_readb
--- 894,898 ----
  #define fb_memset sbus_memset_io
  
! #elif defined(__i386__) || defined(__alpha__) || defined(__x86_64__) || defined(__hppa__) || defined(__sh__) || defined(__powerpc__) || defined(__avr32__)
  
  #define fb_readb __raw_readb
***************
*** 972,975 ****
--- 972,990 ----
  extern struct class *fb_class;
  
+ static inline int lock_fb_info(struct fb_info *info)
+ {
+ 	mutex_lock(&info->lock);
+ 	if (!info->fbops) {
+ 		mutex_unlock(&info->lock);
+ 		return 0;
+ 	}
+ 	return 1;
+ }
+ 
+ static inline void unlock_fb_info(struct fb_info *info)
+ {
+ 	mutex_unlock(&info->lock);
+ }
+ 
  static inline void __fb_pad_aligned_buffer(u8 *dst, u32 d_pitch,
  					   u8 *src, u32 s_pitch, u32 height)