]> git.baikalelectronics.ru Git - kernel.git/commit
[PATCH] nv_of.c build fix
authorAndrew Morton <akpm@osdl.org>
Mon, 14 Nov 2005 00:06:31 +0000 (16:06 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Mon, 14 Nov 2005 02:14:10 +0000 (18:14 -0800)
commitd4e8f42002a6aad6952d731fce681ccab778b219
tree287609492338e589c0abd584ed6b6488ef65c0ed
parentd3343c42e9dc0d6ba769282610368107fc24f928
[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>
drivers/video/nvidia/nv_proto.h