diff options
| author |   Kevin Hao <haokexin@gmail.com> | 2015-03-12 20:32:46 +0800 |
|---|---|---|
| committer |   Michael Ellerman <mpe@ellerman.id.au> | 2015-03-17 20:04:32 +1100 |
| commit | 5299b620977ed6b1edbbedd5d9641c0afa9780fe (patch) | |
| tree | 2d1726fb25210c6e85485ce521e632704ce3b81a /drivers/video/fbdev/nvidia/nv_proto.h | |
| parent | fbdev: imsttfb: remove the dependency on PPC_OF (diff) | |
| download | linux-dev-5299b620977ed6b1edbbedd5d9641c0afa9780fe.tar.xz linux-dev-5299b620977ed6b1edbbedd5d9641c0afa9780fe.zip | |
fbdev: nvidia: remove the dependency on PPC_OF
The OF functionality has moved to a common place and be used by many
archs. So we don't need to include the ppc arch specific header files
and depend on PPC_OF option any more. This is a preparation for
killing PPC_OF.
Signed-off-by: Kevin Hao <haokexin@gmail.com>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Acked-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Diffstat (limited to 'drivers/video/fbdev/nvidia/nv_proto.h')
| -rw-r--r-- | drivers/video/fbdev/nvidia/nv_proto.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/video/fbdev/nvidia/nv_proto.h b/drivers/video/fbdev/nvidia/nv_proto.h index ff5c410355ea..878a5ce02299 100644 --- a/drivers/video/fbdev/nvidia/nv_proto.h +++ b/drivers/video/fbdev/nvidia/nv_proto.h @@ -42,16 +42,8 @@ int nvidia_probe_i2c_connector(struct fb_info *info, int conn, #define nvidia_probe_i2c_connector(p, c, edid) (-1) #endif -#ifdef CONFIG_PPC_OF int nvidia_probe_of_connector(struct fb_info *info, int conn, u8 ** out_edid); -#else -static inline int nvidia_probe_of_connector(struct fb_info *info, int conn, - u8 ** out_edid) -{ - return -1; -} -#endif /* in nv_accel.c */ extern void NVResetGraphics(struct fb_info *info); |