From f7018c21350204c4cf628462f229d44d03545254 Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen Date: Thu, 13 Feb 2014 15:31:38 +0200 Subject: video: move fbdev to drivers/video/fbdev The drivers/video directory is a mess. It contains generic video related files, directories for backlight, console, linux logo, lots of fbdev device drivers, fbdev framework files. Make some order into the chaos by creating drivers/video/fbdev directory, and move all fbdev related files there. No functionality is changed, although I guess it is possible that some subtle Makefile build order related issue could be created by this patch. Signed-off-by: Tomi Valkeinen Acked-by: Laurent Pinchart Acked-by: Geert Uytterhoeven Acked-by: Rob Clark Acked-by: Jingoo Han Acked-by: Daniel Vetter --- drivers/video/nvidia/nv_proto.h | 75 ----------------------------------------- 1 file changed, 75 deletions(-) delete mode 100644 drivers/video/nvidia/nv_proto.h (limited to 'drivers/video/nvidia/nv_proto.h') diff --git a/drivers/video/nvidia/nv_proto.h b/drivers/video/nvidia/nv_proto.h deleted file mode 100644 index ff5c410..0000000 --- a/drivers/video/nvidia/nv_proto.h +++ /dev/null @@ -1,75 +0,0 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_proto.h,v 1.10 2003/07/31 20:24:29 mvojkovi Exp $ */ - -#ifndef __NV_PROTO_H__ -#define __NV_PROTO_H__ - -/* in nv_setup.c */ -int NVCommonSetup(struct fb_info *info); -void NVWriteCrtc(struct nvidia_par *par, u8 index, u8 value); -u8 NVReadCrtc(struct nvidia_par *par, u8 index); -void NVWriteGr(struct nvidia_par *par, u8 index, u8 value); -u8 NVReadGr(struct nvidia_par *par, u8 index); -void NVWriteSeq(struct nvidia_par *par, u8 index, u8 value); -u8 NVReadSeq(struct nvidia_par *par, u8 index); -void NVWriteAttr(struct nvidia_par *par, u8 index, u8 value); -u8 NVReadAttr(struct nvidia_par *par, u8 index); -void NVWriteMiscOut(struct nvidia_par *par, u8 value); -u8 NVReadMiscOut(struct nvidia_par *par); -void NVWriteDacMask(struct nvidia_par *par, u8 value); -void NVWriteDacReadAddr(struct nvidia_par *par, u8 value); -void NVWriteDacWriteAddr(struct nvidia_par *par, u8 value); -void NVWriteDacData(struct nvidia_par *par, u8 value); -u8 NVReadDacData(struct nvidia_par *par); - -/* in nv_hw.c */ -void NVCalcStateExt(struct nvidia_par *par, struct _riva_hw_state *, - int, int, int, int, int, int); -void NVLoadStateExt(struct nvidia_par *par, struct _riva_hw_state *); -void NVUnloadStateExt(struct nvidia_par *par, struct _riva_hw_state *); -void NVSetStartAddress(struct nvidia_par *par, u32); -int NVShowHideCursor(struct nvidia_par *par, int); -void NVLockUnlock(struct nvidia_par *par, int); - -/* in nvidia-i2c.c */ -#ifdef CONFIG_FB_NVIDIA_I2C -void nvidia_create_i2c_busses(struct nvidia_par *par); -void nvidia_delete_i2c_busses(struct nvidia_par *par); -int nvidia_probe_i2c_connector(struct fb_info *info, int conn, - u8 ** out_edid); -#else -#define nvidia_create_i2c_busses(...) -#define nvidia_delete_i2c_busses(...) -#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); -extern void nvidiafb_copyarea(struct fb_info *info, - const struct fb_copyarea *region); -extern void nvidiafb_fillrect(struct fb_info *info, - const struct fb_fillrect *rect); -extern void nvidiafb_imageblit(struct fb_info *info, - const struct fb_image *image); -extern int nvidiafb_sync(struct fb_info *info); - -/* in nv_backlight.h */ -#ifdef CONFIG_FB_NVIDIA_BACKLIGHT -extern void nvidia_bl_init(struct nvidia_par *par); -extern void nvidia_bl_exit(struct nvidia_par *par); -#else -static inline void nvidia_bl_init(struct nvidia_par *par) {} -static inline void nvidia_bl_exit(struct nvidia_par *par) {} -#endif - -#endif /* __NV_PROTO_H__ */ -- cgit v1.1