Update of /cvsroot/gc-linux/linux/include/linux
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv17071/include/linux
Modified Files:
fb.h gpio.h i2c-gpio.h kexec.h linux_logo.h
Log Message:
Rewind to v2.6.31.
Index: linux_logo.h
===================================================================
RCS file: /cvsroot/gc-linux/linux/include/linux/linux_logo.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** linux_logo.h 25 Oct 2009 18:59:28 -0000 1.2
--- linux_logo.h 9 Dec 2009 18:18:07 -0000 1.3
***************
*** 39,43 ****
extern const struct linux_logo logo_blackfin_clut224;
extern const struct linux_logo logo_dec_clut224;
- extern const struct linux_logo logo_gcn_clut224;
extern const struct linux_logo logo_mac_clut224;
extern const struct linux_logo logo_parisc_clut224;
--- 39,42 ----
Index: i2c-gpio.h
===================================================================
RCS file: /cvsroot/gc-linux/linux/include/linux/i2c-gpio.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** i2c-gpio.h 25 Oct 2009 18:59:28 -0000 1.6
--- i2c-gpio.h 9 Dec 2009 18:18:07 -0000 1.7
***************
*** 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: kexec.h
===================================================================
RCS file: /cvsroot/gc-linux/linux/include/linux/kexec.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** kexec.h 25 Oct 2009 18:59:28 -0000 1.4
--- kexec.h 9 Dec 2009 18:18:07 -0000 1.5
***************
*** 53,61 ****
typedef unsigned long kimage_entry_t;
! #define IND_DESTINATION 0x01
! #define IND_INDIRECTION 0x02
! #define IND_DONE 0x04
! #define IND_SOURCE 0x08
! #define IND_NOALLOC 0x10 /* special case for memory preserving code */
#define KEXEC_SEGMENT_MAX 16
--- 53,60 ----
typedef unsigned long kimage_entry_t;
! #define IND_DESTINATION 0x1
! #define IND_INDIRECTION 0x2
! #define IND_DONE 0x4
! #define IND_SOURCE 0x8
#define KEXEC_SEGMENT_MAX 16
***************
*** 127,132 ****
extern struct page *kimage_alloc_control_pages(struct kimage *image,
unsigned int order);
- extern int kimage_add_preserved_region(struct kimage *image, unsigned long to,
- unsigned long from, int length);
extern void crash_kexec(struct pt_regs *);
int kexec_should_crash(struct task_struct *);
--- 126,129 ----
Index: fb.h
===================================================================
RCS file: /cvsroot/gc-linux/linux/include/linux/fb.h,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** fb.h 25 Oct 2009 18:59:28 -0000 1.38
--- fb.h 9 Dec 2009 18:18:07 -0000 1.39
***************
*** 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 ----
***************
*** 918,928 ****
#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
--- 913,917 ----
#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
Index: gpio.h
===================================================================
RCS file: /cvsroot/gc-linux/linux/include/linux/gpio.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** gpio.h 25 Oct 2009 18:59:28 -0000 1.6
--- gpio.h 9 Dec 2009 18:18:07 -0000 1.7
***************
*** 50,58 ****
}
- static inline int gpio_direction_is_output(unsigned gpio)
- {
- return -EINVAL;
- }
-
static inline int gpio_get_value(unsigned gpio)
{
--- 50,53 ----
|
