From f1d44609ca9204bf8c3b4791d894716cd8f6cd96 Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Sun, 4 Mar 2012 17:05:54 +1000 Subject: [PATCH] --- yaml --- r: 293764 b: refs/heads/master c: 05a7c15d48ff53b054bc36fc8a2be8bc9b60d9e7 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/nouveau/nouveau_bios.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 0c6cf7f71200..5bb75d240eea 100644 --- 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 index e5cbead85e50..773d9cbe19df 100644 --- 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)