Commit 09df694a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'fbdev-reorder-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux 

Pull fbdev renaming patches from Tomi Valkeinen:
 "Reorder drivers/video/ directory so that all fbdev drivers are now
  located in drivers/video/fbdev/ and the fbdev framework core files are
  located in drivers/video/fbdev/core/

  The drivers/video/Kconfig is modified so that the DRM and the fbdev
  menu options are in separate submenus, instead of both being mixed in
  the same 'Graphics support' menu level"

* tag 'fbdev-reorder-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux:
  video: Kconfig: move drm and fb into separate menus
  fbdev: move fbdev core files to separate directory
  video: move fbdev to drivers/video/fbdev
parents 6ca2a88a 776bbb97

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/core/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/core/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/core/modedb.c

!Edrivers/video/fbdev/core/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