Update of /cvsroot/gc-linux/linux/include/linux
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv21229/include/linux
Modified Files:
fb.h gpio.h
Log Message:
Forward to v2.6.32.
Index: gpio.h
===================================================================
RCS file: /cvsroot/gc-linux/linux/include/linux/gpio.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** gpio.h 9 Dec 2009 18:18:07 -0000 1.7
--- gpio.h 9 Dec 2009 18:40:10 -0000 1.8
***************
*** 13,16 ****
--- 13,18 ----
#include <linux/errno.h>
+ struct device;
+
/*
* Some platforms don't support the GPIO programming interface.
***************
*** 90,93 ****
--- 92,104 ----
}
+ static inline int gpio_export_link(struct device *dev, const char *name,
+ unsigned gpio)
+ {
+ /* GPIO can never have been exported */
+ WARN_ON(1);
+ return -EINVAL;
+ }
+
+
static inline void gpio_unexport(unsigned gpio)
{
Index: fb.h
===================================================================
RCS file: /cvsroot/gc-linux/linux/include/linux/fb.h,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** fb.h 9 Dec 2009 18:18:07 -0000 1.39
--- fb.h 9 Dec 2009 18:40:10 -0000 1.40
***************
*** 134,137 ****
--- 134,138 ----
#define FB_ACCEL_NEOMAGIC_NM2360 97 /* NeoMagic NM2360 */
#define FB_ACCEL_NEOMAGIC_NM2380 98 /* NeoMagic NM2380 */
+ #define FB_ACCEL_PXA3XX 99 /* PXA3xx */
#define FB_ACCEL_SAVAGE4 0x80 /* S3 Savage4 */
***************
*** 669,678 ****
int (*fb_mmap)(struct fb_info *info, struct vm_area_struct *vma);
- /* save current hardware state */
- void (*fb_save_state)(struct fb_info *info);
-
- /* restore saved state */
- void (*fb_restore_state)(struct fb_info *info);
-
/* get capability given var */
void (*fb_get_caps)(struct fb_info *info, struct fb_blit_caps *caps,
--- 670,673 ----
|
