aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Morton <akpm@osdl.org>2005-11-07 01:00:31 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-07 07:53:49 -0800
commit7f8c54d20b258acf291dd4490b0e22fa10b2a17f (patch)
tree19e1dd1f66b506c6ded5936c659ecbcf481ded95
parent85f1503aff46089acd9f780b5259752839cf0162 (diff)
[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>
-rw-r--r--drivers/video/nvidia/nv_proto.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/video/nvidia/nv_proto.h b/drivers/video/nvidia/nv_proto.h
index 3d35b77a4af..f60b1f43227 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 */