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

fbdev: move fbdev core files to separate directory

Instead of having fbdev framework core files at the root fbdev
directory, mixed with random fbdev device drivers, move the fbdev core
files to a separate core directory. This makes it much clearer which of
the files are actually part of the fbdev framework, and which are part
of device drivers.

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>

+25 -23
+4 -4
Documentation/DocBook/device-drivers.tmpl
··· 276 276 </para> 277 277 278 278 <sect1><title>Frame Buffer Memory</title> 279 - !Edrivers/video/fbdev/fbmem.c 279 + !Edrivers/video/fbdev/core/fbmem.c 280 280 </sect1> 281 281 <!-- 282 282 <sect1><title>Frame Buffer Console</title> ··· 284 284 </sect1> 285 285 --> 286 286 <sect1><title>Frame Buffer Colormap</title> 287 - !Edrivers/video/fbdev/fbcmap.c 287 + !Edrivers/video/fbdev/core/fbcmap.c 288 288 </sect1> 289 289 <!-- FIXME: 290 290 drivers/video/fbgen.c has no docs, which stuffs up the sgml. Comment ··· 294 294 </sect1> 295 295 KAO --> 296 296 <sect1><title>Frame Buffer Video Mode Database</title> 297 - !Idrivers/video/fbdev/modedb.c 298 - !Edrivers/video/fbdev/modedb.c 297 + !Idrivers/video/fbdev/core/modedb.c 298 + !Edrivers/video/fbdev/core/modedb.c 299 299 </sect1> 300 300 <sect1><title>Frame Buffer Macintosh Video Mode Database</title> 301 301 !Edrivers/video/fbdev/macmodes.c
+1 -15
drivers/video/fbdev/Makefile
··· 4 4 5 5 # Each configuration option enables a list of files. 6 6 7 - obj-y += fb_notify.o 8 - obj-$(CONFIG_FB) += fb.o 9 - fb-y := fbmem.o fbmon.o fbcmap.o fbsysfs.o \ 10 - modedb.o fbcvt.o 11 - fb-objs := $(fb-y) 7 + obj-y += core/ 12 8 13 9 obj-$(CONFIG_EXYNOS_VIDEO) += exynos/ 14 10 15 - obj-$(CONFIG_FB_CFB_FILLRECT) += cfbfillrect.o 16 - obj-$(CONFIG_FB_CFB_COPYAREA) += cfbcopyarea.o 17 - obj-$(CONFIG_FB_CFB_IMAGEBLIT) += cfbimgblt.o 18 - obj-$(CONFIG_FB_SYS_FILLRECT) += sysfillrect.o 19 - obj-$(CONFIG_FB_SYS_COPYAREA) += syscopyarea.o 20 - obj-$(CONFIG_FB_SYS_IMAGEBLIT) += sysimgblt.o 21 - obj-$(CONFIG_FB_SYS_FOPS) += fb_sys_fops.o 22 - obj-$(CONFIG_FB_SVGALIB) += svgalib.o 23 11 obj-$(CONFIG_FB_MACMODES) += macmodes.o 24 - obj-$(CONFIG_FB_DDC) += fb_ddc.o 25 - obj-$(CONFIG_FB_DEFERRED_IO) += fb_defio.o 26 12 obj-$(CONFIG_FB_WMT_GE_ROPS) += wmt_ge_rops.o 27 13 28 14 # Hardware specific drivers go first
+1 -1
drivers/video/fbdev/aty/mach64_cursor.c
··· 5 5 #include <linux/fb.h> 6 6 #include <linux/init.h> 7 7 #include <linux/string.h> 8 - #include "../fb_draw.h" 8 + #include "../core/fb_draw.h" 9 9 10 10 #include <asm/io.h> 11 11
drivers/video/fbdev/cfbcopyarea.c drivers/video/fbdev/core/cfbcopyarea.c
drivers/video/fbdev/cfbfillrect.c drivers/video/fbdev/core/cfbfillrect.c
drivers/video/fbdev/cfbimgblt.c drivers/video/fbdev/core/cfbimgblt.c
+16
drivers/video/fbdev/core/Makefile
··· 1 + obj-y += fb_notify.o 2 + obj-$(CONFIG_FB) += fb.o 3 + fb-y := fbmem.o fbmon.o fbcmap.o fbsysfs.o \ 4 + modedb.o fbcvt.o 5 + fb-objs := $(fb-y) 6 + 7 + obj-$(CONFIG_FB_CFB_FILLRECT) += cfbfillrect.o 8 + obj-$(CONFIG_FB_CFB_COPYAREA) += cfbcopyarea.o 9 + obj-$(CONFIG_FB_CFB_IMAGEBLIT) += cfbimgblt.o 10 + obj-$(CONFIG_FB_SYS_FILLRECT) += sysfillrect.o 11 + obj-$(CONFIG_FB_SYS_COPYAREA) += syscopyarea.o 12 + obj-$(CONFIG_FB_SYS_IMAGEBLIT) += sysimgblt.o 13 + obj-$(CONFIG_FB_SYS_FOPS) += fb_sys_fops.o 14 + obj-$(CONFIG_FB_SVGALIB) += svgalib.o 15 + obj-$(CONFIG_FB_DDC) += fb_ddc.o 16 + obj-$(CONFIG_FB_DEFERRED_IO) += fb_defio.o
+1 -1
drivers/video/fbdev/fb_ddc.c drivers/video/fbdev/core/fb_ddc.c
··· 15 15 #include <linux/i2c-algo-bit.h> 16 16 #include <linux/slab.h> 17 17 18 - #include "edid.h" 18 + #include "../edid.h" 19 19 20 20 #define DDC_ADDR 0x50 21 21
drivers/video/fbdev/fb_defio.c drivers/video/fbdev/core/fb_defio.c
drivers/video/fbdev/fb_draw.h drivers/video/fbdev/core/fb_draw.h
drivers/video/fbdev/fb_notify.c drivers/video/fbdev/core/fb_notify.c
drivers/video/fbdev/fb_sys_fops.c drivers/video/fbdev/core/fb_sys_fops.c
drivers/video/fbdev/fbcmap.c drivers/video/fbdev/core/fbcmap.c
drivers/video/fbdev/fbcvt.c drivers/video/fbdev/core/fbcvt.c
drivers/video/fbdev/fbmem.c drivers/video/fbdev/core/fbmem.c
+1 -1
drivers/video/fbdev/fbmon.c drivers/video/fbdev/core/fbmon.c
··· 37 37 #include <asm/prom.h> 38 38 #include <asm/pci-bridge.h> 39 39 #endif 40 - #include "edid.h" 40 + #include "../edid.h" 41 41 42 42 /* 43 43 * EDID parser
drivers/video/fbdev/fbsysfs.c drivers/video/fbdev/core/fbsysfs.c
drivers/video/fbdev/modedb.c drivers/video/fbdev/core/modedb.c
drivers/video/fbdev/svgalib.c drivers/video/fbdev/core/svgalib.c
drivers/video/fbdev/syscopyarea.c drivers/video/fbdev/core/syscopyarea.c
drivers/video/fbdev/sysfillrect.c drivers/video/fbdev/core/sysfillrect.c
drivers/video/fbdev/sysimgblt.c drivers/video/fbdev/core/sysimgblt.c
+1 -1
drivers/video/fbdev/wmt_ge_rops.c
··· 18 18 #include <linux/module.h> 19 19 #include <linux/fb.h> 20 20 #include <linux/platform_device.h> 21 - #include "fb_draw.h" 21 + #include "core/fb_draw.h" 22 22 23 23 #define GE_COMMAND_OFF 0x00 24 24 #define GE_DEPTH_OFF 0x04