rpms/kernel/devel kernel.spec, 1.1672, 1.1673 linux-2.6-vga-arb.patch, 1.3, 1.4

[Dave Airlie]

Author: airlied

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv798

Modified Files:
	kernel.spec linux-2.6-vga-arb.patch 
Log Message:
* Thu Jul 30 2009 Dave Airlie <airlied at redhat.com> 
- fix VGA ARB + kms



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1672
retrieving revision 1.1673
diff -u -p -r1.1672 -r1.1673
--- kernel.spec	29 Jul 2009 18:43:16 -0000	1.1672
+++ kernel.spec	29 Jul 2009 21:10:48 -0000	1.1673
@@ -1933,6 +1933,9 @@ fi
 # and build.
 
 %changelog
+* Thu Jul 30 2009 Dave Airlie <airlied at redhat.com> 
+- fix VGA ARB + kms
+
 * Wed Jul 29 2009 Dave Jones <davej at redhat.com>
 - Add support for dracut. (Harald Hoyer)
 

linux-2.6-vga-arb.patch:
 drivers/gpu/Makefile     |    2 
 drivers/gpu/vga/Kconfig  |   10 
 drivers/gpu/vga/Makefile |    1 
 drivers/gpu/vga/vgaarb.c | 1150 +++++++++++++++++++++++++++++++++++++++++++++++
 drivers/pci/pci.c        |   44 +
 drivers/video/Kconfig    |    2 
 include/linux/pci.h      |    2 
 include/linux/vgaarb.h   |  196 +++++++-
 8 files changed, 1405 insertions(+), 2 deletions(-)

Index: linux-2.6-vga-arb.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-vga-arb.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- linux-2.6-vga-arb.patch	29 Jul 2009 00:34:59 -0000	1.3
+++ linux-2.6-vga-arb.patch	29 Jul 2009 21:10:48 -0000	1.4
@@ -647,7 +647,7 @@ index 0000000..3925e6c
 +	vgadev->irq_set_state = irq_set_state;
 +	vgadev->set_vga_decode = set_vga_decode;
 +	vgadev->cookie = cookie;
-+	ret = vga_count;
++	ret = 0;
 +
 +bail:
 +	spin_unlock_irqrestore(&vga_lock, flags);