Commit c53ca784 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] nv_of.c build fix

drivers/video/nvidia/nv_of.c:33: error: redefinition of `nvidia_probe_of_connector'
drivers/video/nvidia/nv_proto.h:51: error: `nvidia_probe_of_connector' previously defined here

Because the inline version depends on !CONFIG_FB_OF and the out-of-line
version depends on CONFIG_PPC_OF.

Ben said: "Yes, CONFIG_PPC_OF is the right one, must be a typo."

Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
C: "Antonino A. Daplas" <adaplas@pol.net>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 4c8d3d99
...@@ -42,7 +42,7 @@ int nvidia_probe_i2c_connector(struct fb_info *info, int conn, ...@@ -42,7 +42,7 @@ int nvidia_probe_i2c_connector(struct fb_info *info, int conn,
#define nvidia_probe_i2c_connector(p, c, edid) (-1) #define nvidia_probe_i2c_connector(p, c, edid) (-1)
#endif #endif
#ifdef CONFIG_FB_OF #ifdef CONFIG_PPC_OF
int nvidia_probe_of_connector(struct fb_info *info, int conn, int nvidia_probe_of_connector(struct fb_info *info, int conn,
u8 ** out_edid); u8 ** out_edid);
#else #else
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment