[PATCH] nvidiafb-fix-mode-setting-ppc-support-warning-fixes

drivers/video/nvidia/nv_setup.c: In function `NVCommonSetup':
drivers/video/nvidia/nv_setup.c:408: warning: statement with no effect
drivers/video/nvidia/nv_setup.c:496: warning: statement with no effect
drivers/video/nvidia/nv_setup.c:504: warning: statement with no effect

Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: "Antonino A. Daplas" <adaplas@hotpop.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/drivers/video/nvidia/nv_proto.h b/drivers/video/nvidia/nv_proto.h
index 3d35b77a4af57dd2b0c4e2f86f7c2ce2456e4a0d..f60b1f4322700d2554e729245145c9c8407714d3 100644 (file)
--- a/drivers/video/nvidia/nv_proto.h
+++ b/drivers/video/nvidia/nv_proto.h
@@ -46,7 +46,11 @@ int nvidia_probe_i2c_connector(struct fb_info *info, int conn,
 int nvidia_probe_of_connector(struct fb_info *info, int conn,
                              u8 ** out_edid);
 #else
-#define nvidia_probe_of_connector(p, c, edid)  (-1)
+static inline int nvidia_probe_of_connector(struct fb_info *info, int conn,
+                                     u8 ** out_edid)
+{
+       return -1;
+}
 #endif
 
 /* in nv_accel.c */