[Gc-linux-cvs] linux/drivers/video Kconfig,1.16,1.17 gcnfb.c,1.12,1.13 gcngx.c,1.7,1.8 gcngx.h,1.1,1.2

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

Update of /cvsroot/gc-linux/linux/drivers/video
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4338/drivers/video

Modified Files:
	Kconfig gcnfb.c gcngx.c gcngx.h 
Log Message:
2.6.16 merged.


Index: gcngx.h
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/video/gcngx.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- gcngx.h	22 Oct 2004 20:51:16 -0000	1.1
+++ gcngx.h	24 Mar 2006 21:45:18 -0000	1.2
@@ -1,12 +1,8 @@
 #ifndef __GCGX__
 #define __GCGX__
 
-int gcngx_mmap(struct fb_info *info,struct file *file,
-		    struct vm_area_struct *vma);
-
-int gcngx_ioctl(struct inode *inode,struct file *file,
-			    unsigned int cmd,unsigned long arg,
-			    struct fb_info *info);
+int gcngx_mmap(struct fb_info *info, struct vm_area_struct *vma);
+int gcngx_ioctl(struct fb_info *info, unsigned int cmd,unsigned long arg);
 
 int gcngx_init(struct fb_info *info);
 void gcngx_exit(struct fb_info *info);

Index: gcnfb.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/video/gcnfb.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- gcnfb.c	13 Feb 2006 16:03:07 -0000	1.12
+++ gcnfb.c	24 Mar 2006 21:45:18 -0000	1.13
@@ -378,9 +378,8 @@
 /**
  *
  */
-static int gcnfb_ioctl(struct inode *inode, struct file *file,
-		       unsigned int cmd, unsigned long arg,
-		       struct fb_info *info)
+static int gcnfb_ioctl(struct fb_info *info,
+		       unsigned int cmd, unsigned long arg)
 {
 	u32 phys;
 	void __user *argp;
@@ -400,7 +399,7 @@
 		return 0;
 	}
 	/* see if the GX module will handle it */
-	return gcngx_ioctl(inode, file, cmd, arg, info);
+	return gcngx_ioctl(info, cmd, arg);
 }
 
 /**

Index: gcngx.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/video/gcngx.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- gcngx.c	18 Jan 2006 23:41:53 -0000	1.7
+++ gcngx.c	24 Mar 2006 21:45:18 -0000	1.8
@@ -213,9 +213,8 @@
 	return IRQ_HANDLED;
 }
 
-int gcngx_ioctl(struct inode *inode,struct file *file,
-		unsigned int cmd,unsigned long arg,
-		struct fb_info *info)
+int gcngx_ioctl(struct fb_info *info,
+                unsigned int cmd, unsigned long arg)
 {
 	if (cmd == FBIOFLIP)
 	{
@@ -286,9 +285,9 @@
 #endif
 }
 
-int gcngx_mmap(struct fb_info *info,struct file *file,
-	       struct vm_area_struct *vma)
+int gcngx_mmap(struct fb_info *info, struct vm_area_struct *vma)
 {
+	struct file *file = vma->vm_file;
 	int ret;
 	static spinlock_t lock = SPIN_LOCK_UNLOCKED;
 	u32 phys;

Index: Kconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/video/Kconfig,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- Kconfig	18 Jan 2006 23:41:53 -0000	1.16
+++ Kconfig	24 Mar 2006 21:45:18 -0000	1.17
@@ -520,16 +520,11 @@
 config FB_GBE_MEM
 	int "Video memory size in MB"
 	depends on FB_GBE
-	default 8
+	default 4
 	help
 	  This is the amount of memory reserved for the framebuffer,
 	  which can be any value between 1MB and 8MB.
 
-config BUS_I2C
-	bool
-	depends on (FB = y) && VISWS
-	default y
-
 config FB_SUN3
 	bool "Sun3 framebuffer support"
 	depends on (FB = y) && (SUN3 || SUN3X) && BROKEN
@@ -993,12 +988,6 @@
 	  Say Y if you have a laptop with an ATI Rage LT PRO, Rage Mobility,
 	  Rage XC, or Rage XL chipset.
 
-config FB_ATY_XL_INIT
-	bool "Rage XL No-BIOS Init support"
-	depends on FB_ATY_CT
-	help
-	  Say Y here to support booting a Rage XL without BIOS support.
-
 config FB_ATY_GX
 	bool "Mach64 GX support" if PCI
 	depends on FB_ATY
@@ -1151,7 +1140,7 @@
 
 config FB_CYBLA
 	tristate "Cyberblade/i1 support"
-	depends on FB && PCI
+	depends on FB && PCI && X86_32 && !64BIT
 	select FB_CFB_IMAGEBLIT
 	select VIDEO_SELECT
 	---help---
@@ -1385,7 +1374,7 @@
 
 	  This driver is also available as a module ( = code which can be
 	  inserted and removed from the running kernel whenever you want). The
-	  module will be called vfb. If you want to compile it as a module,
+	  module will be called pxafb. If you want to compile it as a module,
 	  say M here and read <file:Documentation/modules.txt>.
 
 	  If unsure, say N.
@@ -1418,7 +1407,7 @@
 
 	  This driver is also available as a module ( = code which can be
 	  inserted and removed from the running kernel whenever you want). The
-	  module will be called vfb. If you want to compile it as a module,
+	  module will be called w100fb. If you want to compile it as a module,
 	  say M here and read <file:Documentation/modules.txt>.
 
 	  If unsure, say N.