Skip to content

Commit

Permalink
video: move fbdev to drivers/video/fbdev
Browse files Browse the repository at this point in the history
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 <tomi.valkeinen@ti.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Acked-by: Rob Clark <robdclark@gmail.com>
Acked-by: Jingoo Han <jg1.han@samsung.com>
Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
  • Loading branch information
Tomi Valkeinen committed Apr 17, 2014
1 parent c26ef3e commit f7018c2
Show file tree
Hide file tree
Showing 481 changed files with 2,672 additions and 2,662 deletions.
10 changes: 5 additions & 5 deletions Documentation/DocBook/device-drivers.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -276,15 +276,15 @@ 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>
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
Expand All @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions drivers/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/xgifb/vb_def.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#ifndef _VB_DEF_
#define _VB_DEF_
#include "../../video/sis/initdef.h"
#include "../../video/fbdev/sis/initdef.h"

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

Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/xgifb/vb_struct.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#ifndef _VB_STRUCT_
#define _VB_STRUCT_
#include "../../video/sis/vstruct.h"
#include "../../video/fbdev/sis/vstruct.h"

struct XGI_LVDSCRT1HDataStruct {
unsigned char Reg[8];
Expand Down
4 changes: 2 additions & 2 deletions drivers/staging/xgifb/vgatypes.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Loading

0 comments on commit f7018c2

Please sign in to comment.