[Gc-linux-cvs] linux/include/linux exi.h,1.15,1.16 fb.h,1.26,1.27

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

Update of /cvsroot/gc-linux/linux/include/linux
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv4818/include/linux

Modified Files:
	exi.h fb.h 
Log Message:
Merged 2.6.24.
Added usbgecko driver.
Added fixes for: exi, gcn-sd, gcn-mic, gcn-gqr.
Adapted: gcn-bba, gcn-gqr, gcn-rtc.
Added very primitive support for the Nintendo Wii.


Index: exi.h
===================================================================
RCS file: /cvsroot/gc-linux/linux/include/linux/exi.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- exi.h	17 Feb 2007 23:43:42 -0000	1.15
+++ exi.h	24 Feb 2008 18:05:34 -0000	1.16
@@ -2,10 +2,10 @@
  * include/linux/exi.h
  *
  * Nintendo GameCube EXpansion Interface definitions
- * Copyright (C) 2004-2005 The GameCube Linux Team
+ * Copyright (C) 2004-2008 The GameCube Linux Team
  * Copyright (C) 2004 Arthur Othieno <a.o...@bl...>
  * Copyright (C) 2004,2005 Todd Jeffreys <to...@vo...>
- * Copyright (C) 2005 Albert Herranz
+ * Copyright (C) 2005,2007,2008 Albert Herranz
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -309,6 +309,12 @@
 	exi_dev_transfer(dev, data, len, EXI_OP_WRITE, 0);
 }
 
+static inline void exi_dev_readwrite(struct exi_device *dev, void *data,
+				     size_t len)
+{
+	exi_dev_transfer(dev, data, len, EXI_OP_READWRITE, 0);
+}
+
 static inline int exi_dev_set_freq(struct exi_device *dev, unsigned int freq)
 {
 	BUG_ON(freq > EXI_MAX_FREQ);

Index: fb.h
===================================================================
RCS file: /cvsroot/gc-linux/linux/include/linux/fb.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- fb.h	16 Nov 2007 23:26:09 -0000	1.26
+++ fb.h	24 Feb 2008 18:05:34 -0000	1.27
@@ -185,6 +185,7 @@
 };
 
 #define FB_NONSTD_HAM		1	/* Hold-And-Modify (HAM)        */
+#define FB_NONSTD_REV_PIX_IN_B	2	/* order of pixels in each byte is reversed */
 
 #define FB_ACTIVATE_NOW		0	/* set values immediately (or vbl)*/
 #define FB_ACTIVATE_NXTOPEN	1	/* activate on next open	*/
@@ -211,6 +212,7 @@
 #define FB_VMODE_NONINTERLACED  0	/* non interlaced */
 #define FB_VMODE_INTERLACED	1	/* interlaced	*/
 #define FB_VMODE_DOUBLE		2	/* double scan */
+#define FB_VMODE_ODD_FLD_FIRST	4	/* interlaced: top line first */
 #define FB_VMODE_MASK		255
 
 #define FB_VMODE_YWRAP		256	/* ywrap instead of panning     */
@@ -1065,6 +1067,7 @@
 	u32 flag;
 };
 
+extern const char *fb_mode_option;
 extern const struct fb_videomode vesa_modes[];
 
 struct fb_modelist {