From: Andrew Morton <akpm@osdl.org>
Date: Mon, 7 Nov 2005 09:00:31 +0000 (-0800)
Subject: [PATCH] nvidiafb-fix-mode-setting-ppc-support-warning-fixes
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=7f8c54d20b258acf291dd4490b0e22fa10b2a17f;p=linux-beck.git

[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 3d35b77a4af5..f60b1f432270 100644
--- 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 */