rpms/xorg-x11-drv-nouveau/F-11 nv50-pramin-vbios.patch, 1.1, 1.2 xorg-x11-drv-nouveau.spec, 1.51, 1.52

[Ben Skeggs]

Author: bskeggs

Update of /cvs/pkgs/rpms/xorg-x11-drv-nouveau/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12103

Modified Files:
	nv50-pramin-vbios.patch xorg-x11-drv-nouveau.spec 
Log Message:
* Fri Jun 19 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.12-40.20090528git0c17b87
- correct thinko in pramin vbios patch



nv50-pramin-vbios.patch:

Index: nv50-pramin-vbios.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/F-11/nv50-pramin-vbios.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- nv50-pramin-vbios.patch	17 Jun 2009 12:10:32 -0000	1.1
+++ nv50-pramin-vbios.patch	18 Jun 2009 15:05:32 -0000	1.2
@@ -18,7 +18,7 @@ diff --git a/src/nv_bios.c b/src/nv_bios
 index ffd6b1f..2630916 100644
 --- a/src/nv_bios.c
 +++ b/src/nv_bios.c
-@@ -190,42 +190,62 @@ static void load_vbios_pci(NVPtr pNv, uint8_t *data)
+@@ -190,42 +190,64 @@ static void load_vbios_pci(NVPtr pNv, uint8_t *data)
  #endif
  }
  
@@ -32,13 +32,15 @@ index ffd6b1f..2630916 100644
 +static struct methods nv04_methods[] = {
 +	{ "PROM", load_vbios_prom, false },
 +	{ "PRAMIN", load_vbios_pramin, true },
-+	{ "PCI ROM", load_vbios_pci, true }
++	{ "PCI ROM", load_vbios_pci, true },
++	{ }
 +};
 +
 +static struct methods nv50_methods[] = {
 +	{ "PRAMIN", load_vbios_pramin, true },
 +	{ "PROM", load_vbios_prom, false },
-+	{ "PCI ROM", load_vbios_pci, true }
++	{ "PCI ROM", load_vbios_pci, true },
++	{ }
 +};
 +
  static bool NVShadowVBIOS(ScrnInfoPtr pScrn, uint8_t *data)


Index: xorg-x11-drv-nouveau.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/F-11/xorg-x11-drv-nouveau.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- xorg-x11-drv-nouveau.spec	17 Jun 2009 12:09:24 -0000	1.51
+++ xorg-x11-drv-nouveau.spec	18 Jun 2009 15:05:32 -0000	1.52
@@ -89,6 +89,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/nouveau.4*
 
 %changelog
+* Fri Jun 19 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.12-40.20090528git0c17b87
+- correct thinko in pramin vbios patch
+
 * Tue Jun 16 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.12-39.20090528git0c17b87
 - minor fixes from upstream
 - nv50-pramin-vbios.patch: rh#492658