---

yaml --- r: 293764 b: refs/heads/master c: 05a7c15 h: refs/heads/master v: v3
git-mirror · Mar 13, 2012 · f1d4460 · f1d4460
1 parent d9afd75
commit f1d4460
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7c5f6a87b2337cc81fb6d16e848501e2dbe00a3d
+refs/heads/master: 05a7c15d48ff53b054bc36fc8a2be8bc9b60d9e7
diff --git a/trunk/drivers/gpu/drm/nouveau/nouveau_bios.c b/trunk/drivers/gpu/drm/nouveau/nouveau_bios.c
@@ -204,8 +204,8 @@ struct methods {
 static struct methods shadow_methods[] = {
 	{ "PRAMIN", load_vbios_pramin, true },
 	{ "PROM", load_vbios_prom, false },
-	{ "PCIROM", load_vbios_pci, true },
 	{ "ACPI", load_vbios_acpi, true },
+	{ "PCIROM", load_vbios_pci, true },
 };
 #define NUM_SHADOW_METHODS ARRAY_SIZE(shadow_methods)