diff --git a/[refs] b/[refs]
index c2de2f504610..4f87183476f0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 77144554de9af353795698161af26e36f7cdbbef
+refs/heads/master: 112d20ad5ca06a9ec7237602ee33bef6fa881daa
diff --git a/trunk/drivers/gpu/drm/nouveau/nv04_mc.c b/trunk/drivers/gpu/drm/nouveau/nv04_mc.c
index 617ed1e05269..2af43a1cb2ec 100644
--- a/trunk/drivers/gpu/drm/nouveau/nv04_mc.c
+++ b/trunk/drivers/gpu/drm/nouveau/nv04_mc.c
@@ -11,6 +11,10 @@ nv04_mc_init(struct drm_device *dev)
 	 */
 
 	nv_wr32(dev, NV03_PMC_ENABLE, 0xFFFFFFFF);
+
+	/* Disable PROM access. */
+	nv_wr32(dev, NV_PBUS_PCI_NV_20, NV_PBUS_PCI_NV_20_ROM_SHADOW_ENABLED);
+
 	return 0;
 }