diff options
Diffstat (limited to 'drivers/video')
-rw-r--r-- | drivers/video/fbdev/Makefile | 16 | ||||
-rw-r--r-- | drivers/video/fbdev/aty/mach64_cursor.c | 2 | ||||
-rw-r--r-- | drivers/video/fbdev/core/Makefile | 16 | ||||
-rw-r--r-- | drivers/video/fbdev/core/cfbcopyarea.c (renamed from drivers/video/fbdev/cfbcopyarea.c) | 0 | ||||
-rw-r--r-- | drivers/video/fbdev/core/cfbfillrect.c (renamed from drivers/video/fbdev/cfbfillrect.c) | 0 | ||||
-rw-r--r-- | drivers/video/fbdev/core/cfbimgblt.c (renamed from drivers/video/fbdev/cfbimgblt.c) | 0 | ||||
-rw-r--r-- | drivers/video/fbdev/core/fb_ddc.c (renamed from drivers/video/fbdev/fb_ddc.c) | 2 | ||||
-rw-r--r-- | drivers/video/fbdev/core/fb_defio.c (renamed from drivers/video/fbdev/fb_defio.c) | 0 | ||||
-rw-r--r-- | drivers/video/fbdev/core/fb_draw.h (renamed from drivers/video/fbdev/fb_draw.h) | 0 | ||||
-rw-r--r-- | drivers/video/fbdev/core/fb_notify.c (renamed from drivers/video/fbdev/fb_notify.c) | 0 | ||||
-rw-r--r-- | drivers/video/fbdev/core/fb_sys_fops.c (renamed from drivers/video/fbdev/fb_sys_fops.c) | 0 | ||||
-rw-r--r-- | drivers/video/fbdev/core/fbcmap.c (renamed from drivers/video/fbdev/fbcmap.c) | 0 | ||||
-rw-r--r-- | drivers/video/fbdev/core/fbcvt.c (renamed from drivers/video/fbdev/fbcvt.c) | 0 | ||||
-rw-r--r-- | drivers/video/fbdev/core/fbmem.c (renamed from drivers/video/fbdev/fbmem.c) | 0 | ||||
-rw-r--r-- | drivers/video/fbdev/core/fbmon.c (renamed from drivers/video/fbdev/fbmon.c) | 2 | ||||
-rw-r--r-- | drivers/video/fbdev/core/fbsysfs.c (renamed from drivers/video/fbdev/fbsysfs.c) | 0 | ||||
-rw-r--r-- | drivers/video/fbdev/core/modedb.c (renamed from drivers/video/fbdev/modedb.c) | 0 | ||||
-rw-r--r-- | drivers/video/fbdev/core/svgalib.c (renamed from drivers/video/fbdev/svgalib.c) | 0 | ||||
-rw-r--r-- | drivers/video/fbdev/core/syscopyarea.c (renamed from drivers/video/fbdev/syscopyarea.c) | 0 | ||||
-rw-r--r-- | drivers/video/fbdev/core/sysfillrect.c (renamed from drivers/video/fbdev/sysfillrect.c) | 0 | ||||
-rw-r--r-- | drivers/video/fbdev/core/sysimgblt.c (renamed from drivers/video/fbdev/sysimgblt.c) | 0 | ||||
-rw-r--r-- | drivers/video/fbdev/wmt_ge_rops.c | 2 |
22 files changed, 21 insertions, 19 deletions
diff --git a/drivers/video/fbdev/Makefile b/drivers/video/fbdev/Makefile index 8a79eec..0284f2a 100644 --- a/drivers/video/fbdev/Makefile +++ b/drivers/video/fbdev/Makefile @@ -4,25 +4,11 @@ # Each configuration option enables a list of files. -obj-y += fb_notify.o -obj-$(CONFIG_FB) += fb.o -fb-y := fbmem.o fbmon.o fbcmap.o fbsysfs.o \ - modedb.o fbcvt.o -fb-objs := $(fb-y) +obj-y += core/ obj-$(CONFIG_EXYNOS_VIDEO) += exynos/ -obj-$(CONFIG_FB_CFB_FILLRECT) += cfbfillrect.o -obj-$(CONFIG_FB_CFB_COPYAREA) += cfbcopyarea.o -obj-$(CONFIG_FB_CFB_IMAGEBLIT) += cfbimgblt.o -obj-$(CONFIG_FB_SYS_FILLRECT) += sysfillrect.o -obj-$(CONFIG_FB_SYS_COPYAREA) += syscopyarea.o -obj-$(CONFIG_FB_SYS_IMAGEBLIT) += sysimgblt.o -obj-$(CONFIG_FB_SYS_FOPS) += fb_sys_fops.o -obj-$(CONFIG_FB_SVGALIB) += svgalib.o obj-$(CONFIG_FB_MACMODES) += macmodes.o -obj-$(CONFIG_FB_DDC) += fb_ddc.o -obj-$(CONFIG_FB_DEFERRED_IO) += fb_defio.o obj-$(CONFIG_FB_WMT_GE_ROPS) += wmt_ge_rops.o # Hardware specific drivers go first diff --git a/drivers/video/fbdev/aty/mach64_cursor.c b/drivers/video/fbdev/aty/mach64_cursor.c index 0fe02e2..2fa0317 100644 --- a/drivers/video/fbdev/aty/mach64_cursor.c +++ b/drivers/video/fbdev/aty/mach64_cursor.c @@ -5,7 +5,7 @@ #include <linux/fb.h> #include <linux/init.h> #include <linux/string.h> -#include "../fb_draw.h" +#include "../core/fb_draw.h" #include <asm/io.h> diff --git a/drivers/video/fbdev/core/Makefile b/drivers/video/fbdev/core/Makefile new file mode 100644 index 0000000..fa30653 --- /dev/null +++ b/drivers/video/fbdev/core/Makefile @@ -0,0 +1,16 @@ +obj-y += fb_notify.o +obj-$(CONFIG_FB) += fb.o +fb-y := fbmem.o fbmon.o fbcmap.o fbsysfs.o \ + modedb.o fbcvt.o +fb-objs := $(fb-y) + +obj-$(CONFIG_FB_CFB_FILLRECT) += cfbfillrect.o +obj-$(CONFIG_FB_CFB_COPYAREA) += cfbcopyarea.o +obj-$(CONFIG_FB_CFB_IMAGEBLIT) += cfbimgblt.o +obj-$(CONFIG_FB_SYS_FILLRECT) += sysfillrect.o +obj-$(CONFIG_FB_SYS_COPYAREA) += syscopyarea.o +obj-$(CONFIG_FB_SYS_IMAGEBLIT) += sysimgblt.o +obj-$(CONFIG_FB_SYS_FOPS) += fb_sys_fops.o +obj-$(CONFIG_FB_SVGALIB) += svgalib.o +obj-$(CONFIG_FB_DDC) += fb_ddc.o +obj-$(CONFIG_FB_DEFERRED_IO) += fb_defio.o diff --git a/drivers/video/fbdev/cfbcopyarea.c b/drivers/video/fbdev/core/cfbcopyarea.c index bcb5723..bcb5723 100644 --- a/drivers/video/fbdev/cfbcopyarea.c +++ b/drivers/video/fbdev/core/cfbcopyarea.c diff --git a/drivers/video/fbdev/cfbfillrect.c b/drivers/video/fbdev/core/cfbfillrect.c index ba9f58b..ba9f58b 100644 --- a/drivers/video/fbdev/cfbfillrect.c +++ b/drivers/video/fbdev/core/cfbfillrect.c diff --git a/drivers/video/fbdev/cfbimgblt.c b/drivers/video/fbdev/core/cfbimgblt.c index a2bb276..a2bb276 100644 --- a/drivers/video/fbdev/cfbimgblt.c +++ b/drivers/video/fbdev/core/cfbimgblt.c diff --git a/drivers/video/fbdev/fb_ddc.c b/drivers/video/fbdev/core/fb_ddc.c index 2b106f0..94322cc 100644 --- a/drivers/video/fbdev/fb_ddc.c +++ b/drivers/video/fbdev/core/fb_ddc.c @@ -15,7 +15,7 @@ #include <linux/i2c-algo-bit.h> #include <linux/slab.h> -#include "edid.h" +#include "../edid.h" #define DDC_ADDR 0x50 diff --git a/drivers/video/fbdev/fb_defio.c b/drivers/video/fbdev/core/fb_defio.c index 900aa4e..900aa4e 100644 --- a/drivers/video/fbdev/fb_defio.c +++ b/drivers/video/fbdev/core/fb_defio.c diff --git a/drivers/video/fbdev/fb_draw.h b/drivers/video/fbdev/core/fb_draw.h index 624ee11..624ee11 100644 --- a/drivers/video/fbdev/fb_draw.h +++ b/drivers/video/fbdev/core/fb_draw.h diff --git a/drivers/video/fbdev/fb_notify.c b/drivers/video/fbdev/core/fb_notify.c index 74c2da5..74c2da5 100644 --- a/drivers/video/fbdev/fb_notify.c +++ b/drivers/video/fbdev/core/fb_notify.c diff --git a/drivers/video/fbdev/fb_sys_fops.c b/drivers/video/fbdev/core/fb_sys_fops.c index ff275d7..ff275d7 100644 --- a/drivers/video/fbdev/fb_sys_fops.c +++ b/drivers/video/fbdev/core/fb_sys_fops.c diff --git a/drivers/video/fbdev/fbcmap.c b/drivers/video/fbdev/core/fbcmap.c index f89245b..f89245b 100644 --- a/drivers/video/fbdev/fbcmap.c +++ b/drivers/video/fbdev/core/fbcmap.c diff --git a/drivers/video/fbdev/fbcvt.c b/drivers/video/fbdev/core/fbcvt.c index 7cb715d..7cb715d 100644 --- a/drivers/video/fbdev/fbcvt.c +++ b/drivers/video/fbdev/core/fbcvt.c diff --git a/drivers/video/fbdev/fbmem.c b/drivers/video/fbdev/core/fbmem.c index b6d5008..b6d5008 100644 --- a/drivers/video/fbdev/fbmem.c +++ b/drivers/video/fbdev/core/fbmem.c diff --git a/drivers/video/fbdev/fbmon.c b/drivers/video/fbdev/core/fbmon.c index 6103fa6..c204ebe 100644 --- a/drivers/video/fbdev/fbmon.c +++ b/drivers/video/fbdev/core/fbmon.c @@ -37,7 +37,7 @@ #include <asm/prom.h> #include <asm/pci-bridge.h> #endif -#include "edid.h" +#include "../edid.h" /* * EDID parser diff --git a/drivers/video/fbdev/fbsysfs.c b/drivers/video/fbdev/core/fbsysfs.c index 53444ac..53444ac 100644 --- a/drivers/video/fbdev/fbsysfs.c +++ b/drivers/video/fbdev/core/fbsysfs.c diff --git a/drivers/video/fbdev/modedb.c b/drivers/video/fbdev/core/modedb.c index a9a907c..a9a907c 100644 --- a/drivers/video/fbdev/modedb.c +++ b/drivers/video/fbdev/core/modedb.c diff --git a/drivers/video/fbdev/svgalib.c b/drivers/video/fbdev/core/svgalib.c index 9e01322..9e01322 100644 --- a/drivers/video/fbdev/svgalib.c +++ b/drivers/video/fbdev/core/svgalib.c diff --git a/drivers/video/fbdev/syscopyarea.c b/drivers/video/fbdev/core/syscopyarea.c index 844a32f..844a32f 100644 --- a/drivers/video/fbdev/syscopyarea.c +++ b/drivers/video/fbdev/core/syscopyarea.c diff --git a/drivers/video/fbdev/sysfillrect.c b/drivers/video/fbdev/core/sysfillrect.c index 33ee3d3..33ee3d3 100644 --- a/drivers/video/fbdev/sysfillrect.c +++ b/drivers/video/fbdev/core/sysfillrect.c diff --git a/drivers/video/fbdev/sysimgblt.c b/drivers/video/fbdev/core/sysimgblt.c index a4d05b1..a4d05b1 100644 --- a/drivers/video/fbdev/sysimgblt.c +++ b/drivers/video/fbdev/core/sysimgblt.c diff --git a/drivers/video/fbdev/wmt_ge_rops.c b/drivers/video/fbdev/wmt_ge_rops.c index b0a9f34..9df6fe7 100644 --- a/drivers/video/fbdev/wmt_ge_rops.c +++ b/drivers/video/fbdev/wmt_ge_rops.c @@ -18,7 +18,7 @@ #include <linux/module.h> #include <linux/fb.h> #include <linux/platform_device.h> -#include "fb_draw.h" +#include "core/fb_draw.h" #define GE_COMMAND_OFF 0x00 #define GE_DEPTH_OFF 0x04 |