Commit f7018c21 authored by Tomi Valkeinen's avatar Tomi Valkeinen
Browse files

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: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
Acked-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Acked-by: default avatarRob Clark <robdclark@gmail.com>
Acked-by: default avatarJingoo Han <jg1.han@samsung.com>
Acked-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent c26ef3eb

Documentation/DocBook/device-drivers.tmpl

+5 −5
Original line number Diff line number Diff line
@@ -276,7 +276,7 @@ X!Isound/sound_firmware.c 
     </para>



     <sect1><title>Frame Buffer Memory</title>

!Edrivers/video/fbmem.c

!Edrivers/video/fbdev/fbmem.c

     </sect1>

<!--

     <sect1><title>Frame Buffer Console</title>
@@ -284,7 +284,7 @@ X!Edrivers/video/console/fbcon.c 
     </sect1>

-->

     <sect1><title>Frame Buffer Colormap</title>

!Edrivers/video/fbcmap.c

!Edrivers/video/fbdev/fbcmap.c

     </sect1>

<!-- FIXME:

  drivers/video/fbgen.c has no docs, which stuffs up the sgml.  Comment
@@ -294,11 +294,11 @@ X!Idrivers/video/fbgen.c 
     </sect1>

KAO -->

     <sect1><title>Frame Buffer Video Mode Database</title>

!Idrivers/video/modedb.c

!Edrivers/video/modedb.c

!Idrivers/video/fbdev/modedb.c

!Edrivers/video/fbdev/modedb.c

     </sect1>

     <sect1><title>Frame Buffer Macintosh Video Mode Database</title>

!Edrivers/video/macmodes.c

!Edrivers/video/fbdev/macmodes.c

     </sect1>

     <sect1><title>Frame Buffer Fonts</title>

        <para>

drivers/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -53,8 +53,8 @@ obj-y += gpu/ 
obj-$(CONFIG_CONNECTOR)		+= connector/



# i810fb and intelfb depend on char/agp/

obj-$(CONFIG_FB_I810)           += video/i810/

obj-$(CONFIG_FB_INTEL)          += video/intelfb/

obj-$(CONFIG_FB_I810)           += video/fbdev/i810/

obj-$(CONFIG_FB_INTEL)          += video/fbdev/intelfb/



obj-$(CONFIG_PARPORT)		+= parport/

obj-y				+= base/ block/ misc/ mfd/ nfc/

drivers/staging/xgifb/vb_def.h

+1 −1
Original line number Diff line number Diff line 
#ifndef _VB_DEF_

#define _VB_DEF_

#include "../../video/sis/initdef.h"

#include "../../video/fbdev/sis/initdef.h"



#define VB_XGI301C      0x0020 /* for 301C */

drivers/staging/xgifb/vb_struct.h

+1 −1
Original line number Diff line number Diff line 
#ifndef _VB_STRUCT_

#define _VB_STRUCT_

#include "../../video/sis/vstruct.h"

#include "../../video/fbdev/sis/vstruct.h"



struct XGI_LVDSCRT1HDataStruct {

	unsigned char Reg[8];

drivers/staging/xgifb/vgatypes.h

+2 −2
Original line number Diff line number Diff line
@@ -2,8 +2,8 @@ 
#define _VGATYPES_



#include <linux/fb.h>	/* for struct fb_var_screeninfo for sis.h */

#include "../../video/sis/vgatypes.h"

#include "../../video/sis/sis.h"		/* for LCD_TYPE */

#include "../../video/fbdev/sis/vgatypes.h"

#include "../../video/fbdev/sis/sis.h"		/* for LCD_TYPE */



#ifndef XGI_VB_CHIP_TYPE

enum XGI_VB_CHIP_TYPE {

CRA Git | Maintained and supported by SUSTech CRA and CCSE