From 3902abb50626627b84113e95111a9da33048e24e Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@osdl.org>
Date: Sun, 13 Nov 2005 16:06:31 -0800
Subject: [PATCH] --- yaml --- r: 14030 b: refs/heads/master c:
 c53ca784dc3e72a17dc210bee0361e13ad83d4cd h: refs/heads/master v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/video/nvidia/nv_proto.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 220ebd9e7f9f..c8a0db6cae17 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4c8d3d997ef3c0594350fba716529905b314287e
+refs/heads/master: c53ca784dc3e72a17dc210bee0361e13ad83d4cd
diff --git a/trunk/drivers/video/nvidia/nv_proto.h b/trunk/drivers/video/nvidia/nv_proto.h
index f60b1f432270..3353103e8b0b 100644
--- a/trunk/drivers/video/nvidia/nv_proto.h
+++ b/trunk/drivers/video/nvidia/nv_proto.h
@@ -42,7 +42,7 @@ int nvidia_probe_i2c_connector(struct fb_info *info, int conn,
 #define nvidia_probe_i2c_connector(p, c, edid) (-1)
 #endif
 
-#ifdef CONFIG_FB_OF
+#ifdef CONFIG_PPC_OF
 int nvidia_probe_of_connector(struct fb_info *info, int conn,
 			      u8 ** out_edid);
 #else