Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Kevin Hao and committed by
Michael Ellerman
5299b620 e9cfb2d6

+1 -17
+1 -2
drivers/video/fbdev/nvidia/Makefile
··· 5 5 obj-$(CONFIG_FB_NVIDIA) += nvidiafb.o 6 6 7 7 nvidiafb-y := nvidia.o nv_hw.o nv_setup.o \ 8 - nv_accel.o 8 + nv_accel.o nv_of.o 9 9 nvidiafb-$(CONFIG_FB_NVIDIA_I2C) += nv_i2c.o 10 10 nvidiafb-$(CONFIG_FB_NVIDIA_BACKLIGHT) += nv_backlight.o 11 - nvidiafb-$(CONFIG_PPC_OF) += nv_of.o 12 11 13 12 nvidiafb-objs := $(nvidiafb-y)
-3
drivers/video/fbdev/nvidia/nv_of.c
··· 19 19 20 20 #include <asm/io.h> 21 21 22 - #include <asm/prom.h> 23 - #include <asm/pci-bridge.h> 24 - 25 22 #include "nv_type.h" 26 23 #include "nv_local.h" 27 24 #include "nv_proto.h"
-8
drivers/video/fbdev/nvidia/nv_proto.h
··· 42 42 #define nvidia_probe_i2c_connector(p, c, edid) (-1) 43 43 #endif 44 44 45 - #ifdef CONFIG_PPC_OF 46 45 int nvidia_probe_of_connector(struct fb_info *info, int conn, 47 46 u8 ** out_edid); 48 - #else 49 - static inline int nvidia_probe_of_connector(struct fb_info *info, int conn, 50 - u8 ** out_edid) 51 - { 52 - return -1; 53 - } 54 - #endif 55 47 56 48 /* in nv_accel.c */ 57 49 extern void NVResetGraphics(struct fb_info *info);
-4
drivers/video/fbdev/nvidia/nvidia.c
··· 24 24 #ifdef CONFIG_MTRR 25 25 #include <asm/mtrr.h> 26 26 #endif 27 - #ifdef CONFIG_PPC_OF 28 - #include <asm/prom.h> 29 - #include <asm/pci-bridge.h> 30 - #endif 31 27 #ifdef CONFIG_BOOTX_TEXT 32 28 #include <asm/btext.h> 33 29 #endif