Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5299b620 authored by Kevin Hao's avatar Kevin Hao Committed by Michael Ellerman
Browse files

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: default avatarKevin Hao <haokexin@gmail.com>
Acked-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Acked-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent e9cfb2d6

drivers/video/fbdev/nvidia/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -5,9 +5,8 @@ 
obj-$(CONFIG_FB_NVIDIA)          += nvidiafb.o



nvidiafb-y                       := nvidia.o nv_hw.o nv_setup.o \

			            nv_accel.o

			            nv_accel.o nv_of.o

nvidiafb-$(CONFIG_FB_NVIDIA_I2C) += nv_i2c.o

nvidiafb-$(CONFIG_FB_NVIDIA_BACKLIGHT)  += nv_backlight.o

nvidiafb-$(CONFIG_PPC_OF)	 += nv_of.o



nvidiafb-objs                    := $(nvidiafb-y)

drivers/video/fbdev/nvidia/nv_of.c

+0 −3
Original line number Diff line number Diff line
@@ -19,9 +19,6 @@ 


#include <asm/io.h>



#include <asm/prom.h>

#include <asm/pci-bridge.h>



#include "nv_type.h"

#include "nv_local.h"

#include "nv_proto.h"

drivers/video/fbdev/nvidia/nv_proto.h

+0 −8
Original line number Diff line number Diff line
@@ -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);

drivers/video/fbdev/nvidia/nvidia.c

+0 −4
Original line number Diff line number Diff line
@@ -24,10 +24,6 @@ 
#ifdef CONFIG_MTRR

#include <asm/mtrr.h>

#endif

#ifdef CONFIG_PPC_OF

#include <asm/prom.h>

#include <asm/pci-bridge.h>

#endif

#ifdef CONFIG_BOOTX_TEXT

#include <asm/btext.h>

#endif