[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: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
parent
4c8d3d997e
commit
c53ca784dc
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user