* [GIT PULL] fbdev reorder for 3.15
@ 2014-04-09 10:48 Tomi Valkeinen
2014-04-09 19:23 ` Linus Torvalds
0 siblings, 1 reply; 4+ messages in thread
From: Tomi Valkeinen @ 2014-04-09 10:48 UTC (permalink / raw)
To: Linus Torvalds
Cc: linux-kernel, linux-fbdev, Jean-Christophe PLAGNIOL-VILLARD
[-- Attachment #1: Type: text/plain, Size: 59030 bytes --]
Hi Linus,
Please pull the final fbdev changes for 3.15. This one reorders the
drivers/video directory structure.
The patches are based on 3.14-rc4, and cause big conflicts, although the
conflicts are not complex as such. They are resolved in linux-next, and also in
my two branches below. The first one contains a resolved merge for your master
branch, the second one contains rebased patches on top of your master.
git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux.git 3.15/fb-reorder-merged
git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux.git 3.15/fb-reorder-rebased
I could also do a rebased version on top of 3.15-rc1 when it's released, if
that's more sensible. Or, if this kind of big move-files-around is a bad thing
(nobody has so far complained, on the contrary), we could also drop the whole
series.
Tomi
The following changes since commit cfbf8d4857c26a8a307fb7cd258074c9dcd8c691:
Linux 3.14-rc4 (2014-02-23 17:40:03 -0800)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux.git tags/fbdev-reorder-3.15
for you to fetch changes up to a1fd56fc812e29931f68acd05893f095a5ce5473:
video: Kconfig: move drm and fb into separate menus (2014-03-05 08:28:52 +0200)
----------------------------------------------------------------
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.
----------------------------------------------------------------
Tomi Valkeinen (3):
video: move fbdev to drivers/video/fbdev
fbdev: move fbdev core files to separate directory
video: Kconfig: move drm and fb into separate menus
Documentation/DocBook/device-drivers.tmpl | 10 +-
drivers/Makefile | 4 +-
drivers/staging/xgifb/vb_def.h | 2 +-
drivers/staging/xgifb/vb_struct.h | 2 +-
drivers/staging/xgifb/vgatypes.h | 4 +-
drivers/video/Kconfig | 2487 +-------------------
drivers/video/Makefile | 168 +-
drivers/video/console/sticon.c | 2 +-
drivers/video/console/sticore.c | 2 +-
drivers/video/{ => fbdev}/68328fb.c | 0
drivers/video/fbdev/Kconfig | 2481 +++++++++++++++++++
drivers/video/fbdev/Makefile | 153 ++
drivers/video/{ => fbdev}/acornfb.c | 0
drivers/video/{ => fbdev}/acornfb.h | 0
drivers/video/{ => fbdev}/amba-clcd.c | 0
drivers/video/{ => fbdev}/amifb.c | 0
drivers/video/{ => fbdev}/arcfb.c | 0
drivers/video/{ => fbdev}/arkfb.c | 0
drivers/video/{ => fbdev}/asiliantfb.c | 0
drivers/video/{ => fbdev}/atafb.c | 0
drivers/video/{ => fbdev}/atafb.h | 0
drivers/video/{ => fbdev}/atafb_iplan2p2.c | 0
drivers/video/{ => fbdev}/atafb_iplan2p4.c | 0
drivers/video/{ => fbdev}/atafb_iplan2p8.c | 0
drivers/video/{ => fbdev}/atafb_mfb.c | 0
drivers/video/{ => fbdev}/atafb_utils.h | 0
drivers/video/{ => fbdev}/atmel_lcdfb.c | 0
drivers/video/{ => fbdev}/aty/Makefile | 0
drivers/video/{ => fbdev}/aty/ati_ids.h | 0
drivers/video/{ => fbdev}/aty/aty128fb.c | 0
drivers/video/{ => fbdev}/aty/atyfb.h | 0
drivers/video/{ => fbdev}/aty/atyfb_base.c | 0
drivers/video/{ => fbdev}/aty/mach64_accel.c | 0
drivers/video/{ => fbdev}/aty/mach64_ct.c | 0
drivers/video/{ => fbdev}/aty/mach64_cursor.c | 0
drivers/video/{ => fbdev}/aty/mach64_gx.c | 0
drivers/video/{ => fbdev}/aty/radeon_accel.c | 0
drivers/video/{ => fbdev}/aty/radeon_backlight.c | 0
drivers/video/{ => fbdev}/aty/radeon_base.c | 0
drivers/video/{ => fbdev}/aty/radeon_i2c.c | 0
drivers/video/{ => fbdev}/aty/radeon_monitor.c | 0
drivers/video/{ => fbdev}/aty/radeon_pm.c | 0
drivers/video/{ => fbdev}/aty/radeonfb.h | 0
drivers/video/{ => fbdev}/au1100fb.c | 0
drivers/video/{ => fbdev}/au1100fb.h | 0
drivers/video/{ => fbdev}/au1200fb.c | 0
drivers/video/{ => fbdev}/au1200fb.h | 0
drivers/video/{ => fbdev}/auo_k1900fb.c | 0
drivers/video/{ => fbdev}/auo_k1901fb.c | 0
drivers/video/{ => fbdev}/auo_k190x.c | 0
drivers/video/{ => fbdev}/auo_k190x.h | 0
drivers/video/{ => fbdev}/bf537-lq035.c | 0
drivers/video/{ => fbdev}/bf54x-lq043fb.c | 0
drivers/video/{ => fbdev}/bfin-lq035q1-fb.c | 0
drivers/video/{ => fbdev}/bfin-t350mcqb-fb.c | 0
drivers/video/{ => fbdev}/bfin_adv7393fb.c | 0
drivers/video/{ => fbdev}/bfin_adv7393fb.h | 0
drivers/video/{ => fbdev}/broadsheetfb.c | 0
drivers/video/{ => fbdev}/bt431.h | 0
drivers/video/{ => fbdev}/bt455.h | 0
drivers/video/{ => fbdev}/bw2.c | 0
drivers/video/{ => fbdev}/c2p.h | 0
drivers/video/{ => fbdev}/c2p_core.h | 0
drivers/video/{ => fbdev}/c2p_iplan2.c | 0
drivers/video/{ => fbdev}/c2p_planar.c | 0
drivers/video/{ => fbdev}/carminefb.c | 0
drivers/video/{ => fbdev}/carminefb.h | 0
drivers/video/{ => fbdev}/carminefb_regs.h | 0
drivers/video/{ => fbdev}/cg14.c | 0
drivers/video/{ => fbdev}/cg3.c | 0
drivers/video/{ => fbdev}/cg6.c | 0
drivers/video/{ => fbdev}/chipsfb.c | 0
drivers/video/{ => fbdev}/cirrusfb.c | 0
drivers/video/{ => fbdev}/clps711xfb.c | 0
drivers/video/{ => fbdev}/cobalt_lcdfb.c | 0
drivers/video/{ => fbdev}/controlfb.c | 0
drivers/video/{ => fbdev}/controlfb.h | 0
drivers/video/fbdev/core/Makefile | 16 +
drivers/video/{ => fbdev/core}/cfbcopyarea.c | 0
drivers/video/{ => fbdev/core}/cfbfillrect.c | 0
drivers/video/{ => fbdev/core}/cfbimgblt.c | 0
drivers/video/{ => fbdev/core}/fb_ddc.c | 2 +-
drivers/video/{ => fbdev/core}/fb_defio.c | 0
drivers/video/{ => fbdev/core}/fb_draw.h | 0
drivers/video/{ => fbdev/core}/fb_notify.c | 0
drivers/video/{ => fbdev/core}/fb_sys_fops.c | 0
drivers/video/{ => fbdev/core}/fbcmap.c | 0
drivers/video/{ => fbdev/core}/fbcvt.c | 0
drivers/video/{ => fbdev/core}/fbmem.c | 0
drivers/video/{ => fbdev/core}/fbmon.c | 2 +-
drivers/video/{ => fbdev/core}/fbsysfs.c | 0
drivers/video/{ => fbdev/core}/modedb.c | 0
drivers/video/{ => fbdev/core}/svgalib.c | 0
drivers/video/{ => fbdev/core}/syscopyarea.c | 0
drivers/video/{ => fbdev/core}/sysfillrect.c | 0
drivers/video/{ => fbdev/core}/sysimgblt.c | 0
drivers/video/{ => fbdev}/cyber2000fb.c | 0
drivers/video/{ => fbdev}/cyber2000fb.h | 0
drivers/video/{ => fbdev}/da8xx-fb.c | 0
drivers/video/{ => fbdev}/dnfb.c | 0
drivers/video/{ => fbdev}/edid.h | 0
drivers/video/{ => fbdev}/efifb.c | 0
drivers/video/{ => fbdev}/ep93xx-fb.c | 0
drivers/video/{ => fbdev}/exynos/Kconfig | 0
drivers/video/{ => fbdev}/exynos/Makefile | 0
drivers/video/{ => fbdev}/exynos/exynos_dp_core.c | 0
drivers/video/{ => fbdev}/exynos/exynos_dp_core.h | 0
drivers/video/{ => fbdev}/exynos/exynos_dp_reg.c | 0
drivers/video/{ => fbdev}/exynos/exynos_dp_reg.h | 0
drivers/video/{ => fbdev}/exynos/exynos_mipi_dsi.c | 0
.../{ => fbdev}/exynos/exynos_mipi_dsi_common.c | 0
.../{ => fbdev}/exynos/exynos_mipi_dsi_common.h | 0
.../{ => fbdev}/exynos/exynos_mipi_dsi_lowlevel.c | 0
.../{ => fbdev}/exynos/exynos_mipi_dsi_lowlevel.h | 0
.../{ => fbdev}/exynos/exynos_mipi_dsi_regs.h | 0
drivers/video/{ => fbdev}/exynos/s6e8ax0.c | 0
drivers/video/{ => fbdev}/fb-puv3.c | 0
drivers/video/{ => fbdev}/ffb.c | 0
drivers/video/{ => fbdev}/fm2fb.c | 0
drivers/video/{ => fbdev}/fsl-diu-fb.c | 0
drivers/video/{ => fbdev}/g364fb.c | 0
drivers/video/{ => fbdev}/gbefb.c | 0
drivers/video/{ => fbdev}/geode/Kconfig | 0
drivers/video/{ => fbdev}/geode/Makefile | 0
drivers/video/{ => fbdev}/geode/display_gx.c | 0
drivers/video/{ => fbdev}/geode/display_gx1.c | 0
drivers/video/{ => fbdev}/geode/display_gx1.h | 0
drivers/video/{ => fbdev}/geode/geodefb.h | 0
drivers/video/{ => fbdev}/geode/gx1fb_core.c | 0
drivers/video/{ => fbdev}/geode/gxfb.h | 0
drivers/video/{ => fbdev}/geode/gxfb_core.c | 0
drivers/video/{ => fbdev}/geode/lxfb.h | 0
drivers/video/{ => fbdev}/geode/lxfb_core.c | 0
drivers/video/{ => fbdev}/geode/lxfb_ops.c | 0
drivers/video/{ => fbdev}/geode/suspend_gx.c | 0
drivers/video/{ => fbdev}/geode/video_cs5530.c | 0
drivers/video/{ => fbdev}/geode/video_cs5530.h | 0
drivers/video/{ => fbdev}/geode/video_gx.c | 0
drivers/video/{ => fbdev}/goldfishfb.c | 0
drivers/video/{ => fbdev}/grvga.c | 0
drivers/video/{ => fbdev}/gxt4500.c | 0
drivers/video/{ => fbdev}/hecubafb.c | 0
drivers/video/{ => fbdev}/hgafb.c | 0
drivers/video/{ => fbdev}/hitfb.c | 0
drivers/video/{ => fbdev}/hpfb.c | 0
drivers/video/{ => fbdev}/hyperv_fb.c | 0
drivers/video/{ => fbdev}/i740_reg.h | 0
drivers/video/{ => fbdev}/i740fb.c | 0
drivers/video/{ => fbdev}/i810/Makefile | 0
drivers/video/{ => fbdev}/i810/i810-i2c.c | 0
drivers/video/{ => fbdev}/i810/i810.h | 0
drivers/video/{ => fbdev}/i810/i810_accel.c | 0
drivers/video/{ => fbdev}/i810/i810_dvt.c | 0
drivers/video/{ => fbdev}/i810/i810_gtf.c | 0
drivers/video/{ => fbdev}/i810/i810_main.c | 0
drivers/video/{ => fbdev}/i810/i810_main.h | 0
drivers/video/{ => fbdev}/i810/i810_regs.h | 0
drivers/video/{ => fbdev}/igafb.c | 0
drivers/video/{ => fbdev}/imsttfb.c | 0
drivers/video/{ => fbdev}/imxfb.c | 0
drivers/video/{ => fbdev}/intelfb/Makefile | 0
drivers/video/{ => fbdev}/intelfb/intelfb.h | 0
drivers/video/{ => fbdev}/intelfb/intelfb_i2c.c | 0
drivers/video/{ => fbdev}/intelfb/intelfbdrv.c | 0
drivers/video/{ => fbdev}/intelfb/intelfbhw.c | 0
drivers/video/{ => fbdev}/intelfb/intelfbhw.h | 0
drivers/video/{ => fbdev}/jz4740_fb.c | 0
drivers/video/{ => fbdev}/kyro/Makefile | 0
drivers/video/{ => fbdev}/kyro/STG4000InitDevice.c | 0
drivers/video/{ => fbdev}/kyro/STG4000Interface.h | 0
.../video/{ => fbdev}/kyro/STG4000OverlayDevice.c | 0
drivers/video/{ => fbdev}/kyro/STG4000Ramdac.c | 0
drivers/video/{ => fbdev}/kyro/STG4000Reg.h | 0
drivers/video/{ => fbdev}/kyro/STG4000VTG.c | 0
drivers/video/{ => fbdev}/kyro/fbdev.c | 0
drivers/video/{ => fbdev}/leo.c | 0
drivers/video/{ => fbdev}/macfb.c | 0
drivers/video/{ => fbdev}/macmodes.c | 0
drivers/video/{ => fbdev}/macmodes.h | 0
drivers/video/{ => fbdev}/matrox/Makefile | 0
drivers/video/{ => fbdev}/matrox/g450_pll.c | 0
drivers/video/{ => fbdev}/matrox/g450_pll.h | 0
drivers/video/{ => fbdev}/matrox/i2c-matroxfb.c | 0
.../video/{ => fbdev}/matrox/matroxfb_DAC1064.c | 0
.../video/{ => fbdev}/matrox/matroxfb_DAC1064.h | 0
drivers/video/{ => fbdev}/matrox/matroxfb_Ti3026.c | 0
drivers/video/{ => fbdev}/matrox/matroxfb_Ti3026.h | 0
drivers/video/{ => fbdev}/matrox/matroxfb_accel.c | 0
drivers/video/{ => fbdev}/matrox/matroxfb_accel.h | 0
drivers/video/{ => fbdev}/matrox/matroxfb_base.c | 0
drivers/video/{ => fbdev}/matrox/matroxfb_base.h | 0
drivers/video/{ => fbdev}/matrox/matroxfb_crtc2.c | 0
drivers/video/{ => fbdev}/matrox/matroxfb_crtc2.h | 0
drivers/video/{ => fbdev}/matrox/matroxfb_g450.c | 0
drivers/video/{ => fbdev}/matrox/matroxfb_g450.h | 0
drivers/video/{ => fbdev}/matrox/matroxfb_maven.c | 0
drivers/video/{ => fbdev}/matrox/matroxfb_maven.h | 0
drivers/video/{ => fbdev}/matrox/matroxfb_misc.c | 0
drivers/video/{ => fbdev}/matrox/matroxfb_misc.h | 0
drivers/video/{ => fbdev}/maxinefb.c | 0
drivers/video/{ => fbdev}/mb862xx/Makefile | 0
drivers/video/{ => fbdev}/mb862xx/mb862xx-i2c.c | 0
drivers/video/{ => fbdev}/mb862xx/mb862xx_reg.h | 0
drivers/video/{ => fbdev}/mb862xx/mb862xxfb.h | 0
.../video/{ => fbdev}/mb862xx/mb862xxfb_accel.c | 0
.../video/{ => fbdev}/mb862xx/mb862xxfb_accel.h | 0
drivers/video/{ => fbdev}/mb862xx/mb862xxfbdrv.c | 0
drivers/video/{ => fbdev}/mbx/Makefile | 0
drivers/video/{ => fbdev}/mbx/mbxdebugfs.c | 0
drivers/video/{ => fbdev}/mbx/mbxfb.c | 0
drivers/video/{ => fbdev}/mbx/reg_bits.h | 0
drivers/video/{ => fbdev}/mbx/regs.h | 0
drivers/video/{ => fbdev}/metronomefb.c | 0
drivers/video/{ => fbdev}/mmp/Kconfig | 6 +-
drivers/video/{ => fbdev}/mmp/Makefile | 0
drivers/video/{ => fbdev}/mmp/core.c | 0
drivers/video/{ => fbdev}/mmp/fb/Kconfig | 0
drivers/video/{ => fbdev}/mmp/fb/Makefile | 0
drivers/video/{ => fbdev}/mmp/fb/mmpfb.c | 0
drivers/video/{ => fbdev}/mmp/fb/mmpfb.h | 0
drivers/video/{ => fbdev}/mmp/hw/Kconfig | 0
drivers/video/{ => fbdev}/mmp/hw/Makefile | 0
drivers/video/{ => fbdev}/mmp/hw/mmp_ctrl.c | 0
drivers/video/{ => fbdev}/mmp/hw/mmp_ctrl.h | 0
drivers/video/{ => fbdev}/mmp/hw/mmp_spi.c | 0
drivers/video/{ => fbdev}/mmp/panel/Kconfig | 0
drivers/video/{ => fbdev}/mmp/panel/Makefile | 0
.../video/{ => fbdev}/mmp/panel/tpo_tj032md01bw.c | 0
drivers/video/{ => fbdev}/msm/Makefile | 0
drivers/video/{ => fbdev}/msm/mddi.c | 0
drivers/video/{ => fbdev}/msm/mddi_client_dummy.c | 0
.../video/{ => fbdev}/msm/mddi_client_nt35399.c | 0
.../video/{ => fbdev}/msm/mddi_client_toshiba.c | 0
drivers/video/{ => fbdev}/msm/mddi_hw.h | 0
drivers/video/{ => fbdev}/msm/mdp.c | 0
drivers/video/{ => fbdev}/msm/mdp_csc_table.h | 0
drivers/video/{ => fbdev}/msm/mdp_hw.h | 0
drivers/video/{ => fbdev}/msm/mdp_ppp.c | 0
drivers/video/{ => fbdev}/msm/mdp_scale_tables.c | 0
drivers/video/{ => fbdev}/msm/mdp_scale_tables.h | 0
drivers/video/{ => fbdev}/msm/msm_fb.c | 0
drivers/video/{ => fbdev}/mx3fb.c | 0
drivers/video/{ => fbdev}/mxsfb.c | 0
drivers/video/{ => fbdev}/n411.c | 0
drivers/video/{ => fbdev}/neofb.c | 0
drivers/video/{ => fbdev}/nuc900fb.c | 0
drivers/video/{ => fbdev}/nuc900fb.h | 0
drivers/video/{ => fbdev}/nvidia/Makefile | 0
drivers/video/{ => fbdev}/nvidia/nv_accel.c | 0
drivers/video/{ => fbdev}/nvidia/nv_backlight.c | 0
drivers/video/{ => fbdev}/nvidia/nv_dma.h | 0
drivers/video/{ => fbdev}/nvidia/nv_hw.c | 0
drivers/video/{ => fbdev}/nvidia/nv_i2c.c | 0
drivers/video/{ => fbdev}/nvidia/nv_local.h | 0
drivers/video/{ => fbdev}/nvidia/nv_of.c | 0
drivers/video/{ => fbdev}/nvidia/nv_proto.h | 0
drivers/video/{ => fbdev}/nvidia/nv_setup.c | 0
drivers/video/{ => fbdev}/nvidia/nv_type.h | 0
drivers/video/{ => fbdev}/nvidia/nvidia.c | 0
drivers/video/{ => fbdev}/ocfb.c | 0
drivers/video/{ => fbdev}/offb.c | 0
drivers/video/{ => fbdev}/omap/Kconfig | 0
drivers/video/{ => fbdev}/omap/Makefile | 0
drivers/video/{ => fbdev}/omap/hwa742.c | 0
drivers/video/{ => fbdev}/omap/lcd_ams_delta.c | 0
drivers/video/{ => fbdev}/omap/lcd_h3.c | 0
drivers/video/{ => fbdev}/omap/lcd_htcherald.c | 0
drivers/video/{ => fbdev}/omap/lcd_inn1510.c | 0
drivers/video/{ => fbdev}/omap/lcd_inn1610.c | 0
drivers/video/{ => fbdev}/omap/lcd_mipid.c | 0
drivers/video/{ => fbdev}/omap/lcd_osk.c | 0
drivers/video/{ => fbdev}/omap/lcd_palmte.c | 0
drivers/video/{ => fbdev}/omap/lcd_palmtt.c | 0
drivers/video/{ => fbdev}/omap/lcd_palmz71.c | 0
drivers/video/{ => fbdev}/omap/lcdc.c | 0
drivers/video/{ => fbdev}/omap/lcdc.h | 0
drivers/video/{ => fbdev}/omap/omapfb.h | 0
drivers/video/{ => fbdev}/omap/omapfb_main.c | 0
drivers/video/{ => fbdev}/omap/sossi.c | 0
drivers/video/fbdev/omap2/Kconfig | 10 +
drivers/video/{ => fbdev}/omap2/Makefile | 0
.../video/{ => fbdev}/omap2/displays-new/Kconfig | 0
.../video/{ => fbdev}/omap2/displays-new/Makefile | 0
.../omap2/displays-new/connector-analog-tv.c | 0
.../{ => fbdev}/omap2/displays-new/connector-dvi.c | 0
.../omap2/displays-new/connector-hdmi.c | 0
.../omap2/displays-new/encoder-tfp410.c | 0
.../omap2/displays-new/encoder-tpd12s015.c | 0
.../{ => fbdev}/omap2/displays-new/panel-dpi.c | 0
.../{ => fbdev}/omap2/displays-new/panel-dsi-cm.c | 0
.../omap2/displays-new/panel-lgphilips-lb035q02.c | 0
.../omap2/displays-new/panel-nec-nl8048hl11.c | 0
.../omap2/displays-new/panel-sharp-ls037v7dw01.c | 0
.../omap2/displays-new/panel-sony-acx565akm.c | 0
.../omap2/displays-new/panel-tpo-td028ttec1.c | 0
.../omap2/displays-new/panel-tpo-td043mtea1.c | 0
drivers/video/{ => fbdev}/omap2/dss/Kconfig | 0
drivers/video/{ => fbdev}/omap2/dss/Makefile | 0
drivers/video/{ => fbdev}/omap2/dss/apply.c | 0
drivers/video/{ => fbdev}/omap2/dss/core.c | 0
drivers/video/{ => fbdev}/omap2/dss/dispc-compat.c | 0
drivers/video/{ => fbdev}/omap2/dss/dispc-compat.h | 0
drivers/video/{ => fbdev}/omap2/dss/dispc.c | 0
drivers/video/{ => fbdev}/omap2/dss/dispc.h | 0
drivers/video/{ => fbdev}/omap2/dss/dispc_coefs.c | 0
.../video/{ => fbdev}/omap2/dss/display-sysfs.c | 0
drivers/video/{ => fbdev}/omap2/dss/display.c | 0
drivers/video/{ => fbdev}/omap2/dss/dpi.c | 0
drivers/video/{ => fbdev}/omap2/dss/dsi.c | 0
drivers/video/{ => fbdev}/omap2/dss/dss.c | 0
drivers/video/{ => fbdev}/omap2/dss/dss.h | 0
drivers/video/{ => fbdev}/omap2/dss/dss_features.c | 0
drivers/video/{ => fbdev}/omap2/dss/dss_features.h | 0
drivers/video/{ => fbdev}/omap2/dss/hdmi.h | 0
drivers/video/{ => fbdev}/omap2/dss/hdmi4.c | 0
drivers/video/{ => fbdev}/omap2/dss/hdmi4_core.c | 0
drivers/video/{ => fbdev}/omap2/dss/hdmi4_core.h | 0
drivers/video/{ => fbdev}/omap2/dss/hdmi_common.c | 0
drivers/video/{ => fbdev}/omap2/dss/hdmi_phy.c | 0
drivers/video/{ => fbdev}/omap2/dss/hdmi_pll.c | 0
drivers/video/{ => fbdev}/omap2/dss/hdmi_wp.c | 0
.../video/{ => fbdev}/omap2/dss/manager-sysfs.c | 0
drivers/video/{ => fbdev}/omap2/dss/manager.c | 0
drivers/video/{ => fbdev}/omap2/dss/output.c | 0
.../video/{ => fbdev}/omap2/dss/overlay-sysfs.c | 0
drivers/video/{ => fbdev}/omap2/dss/overlay.c | 0
drivers/video/{ => fbdev}/omap2/dss/rfbi.c | 0
drivers/video/{ => fbdev}/omap2/dss/sdi.c | 0
drivers/video/{ => fbdev}/omap2/dss/venc.c | 0
drivers/video/{ => fbdev}/omap2/dss/venc_panel.c | 0
drivers/video/{ => fbdev}/omap2/omapfb/Kconfig | 0
drivers/video/{ => fbdev}/omap2/omapfb/Makefile | 0
.../video/{ => fbdev}/omap2/omapfb/omapfb-ioctl.c | 0
.../video/{ => fbdev}/omap2/omapfb/omapfb-main.c | 0
.../video/{ => fbdev}/omap2/omapfb/omapfb-sysfs.c | 0
drivers/video/{ => fbdev}/omap2/omapfb/omapfb.h | 0
drivers/video/{ => fbdev}/omap2/vrfb.c | 0
drivers/video/{ => fbdev}/p9100.c | 0
drivers/video/{ => fbdev}/platinumfb.c | 0
drivers/video/{ => fbdev}/platinumfb.h | 0
drivers/video/{ => fbdev}/pm2fb.c | 0
drivers/video/{ => fbdev}/pm3fb.c | 0
drivers/video/{ => fbdev}/pmag-aa-fb.c | 0
drivers/video/{ => fbdev}/pmag-ba-fb.c | 0
drivers/video/{ => fbdev}/pmagb-b-fb.c | 0
drivers/video/{ => fbdev}/ps3fb.c | 0
drivers/video/{ => fbdev}/pvr2fb.c | 0
drivers/video/{ => fbdev}/pxa168fb.c | 0
drivers/video/{ => fbdev}/pxa168fb.h | 0
drivers/video/{ => fbdev}/pxa3xx-gcu.c | 0
drivers/video/{ => fbdev}/pxa3xx-gcu.h | 0
drivers/video/{ => fbdev}/pxafb.c | 0
drivers/video/{ => fbdev}/pxafb.h | 0
drivers/video/{ => fbdev}/q40fb.c | 0
drivers/video/{ => fbdev}/riva/Makefile | 0
drivers/video/{ => fbdev}/riva/fbdev.c | 0
drivers/video/{ => fbdev}/riva/nv_driver.c | 0
drivers/video/{ => fbdev}/riva/nv_type.h | 0
drivers/video/{ => fbdev}/riva/nvreg.h | 0
drivers/video/{ => fbdev}/riva/riva_hw.c | 0
drivers/video/{ => fbdev}/riva/riva_hw.h | 0
drivers/video/{ => fbdev}/riva/riva_tbl.h | 0
drivers/video/{ => fbdev}/riva/rivafb-i2c.c | 0
drivers/video/{ => fbdev}/riva/rivafb.h | 0
drivers/video/{ => fbdev}/s1d13xxxfb.c | 0
drivers/video/{ => fbdev}/s3c-fb.c | 0
drivers/video/{ => fbdev}/s3c2410fb.c | 0
drivers/video/{ => fbdev}/s3c2410fb.h | 0
drivers/video/{ => fbdev}/s3fb.c | 0
drivers/video/{ => fbdev}/sa1100fb.c | 0
drivers/video/{ => fbdev}/sa1100fb.h | 0
drivers/video/{ => fbdev}/savage/Makefile | 0
drivers/video/{ => fbdev}/savage/savagefb-i2c.c | 0
drivers/video/{ => fbdev}/savage/savagefb.h | 0
drivers/video/{ => fbdev}/savage/savagefb_accel.c | 0
drivers/video/{ => fbdev}/savage/savagefb_driver.c | 0
drivers/video/{ => fbdev}/sbuslib.c | 0
drivers/video/{ => fbdev}/sbuslib.h | 0
drivers/video/{ => fbdev}/sgivwfb.c | 0
drivers/video/{ => fbdev}/sh7760fb.c | 0
drivers/video/{ => fbdev}/sh_mipi_dsi.c | 0
drivers/video/{ => fbdev}/sh_mobile_hdmi.c | 0
drivers/video/{ => fbdev}/sh_mobile_lcdcfb.c | 0
drivers/video/{ => fbdev}/sh_mobile_lcdcfb.h | 0
drivers/video/{ => fbdev}/sh_mobile_meram.c | 0
drivers/video/{ => fbdev}/simplefb.c | 0
drivers/video/{ => fbdev}/sis/300vtbl.h | 0
drivers/video/{ => fbdev}/sis/310vtbl.h | 0
drivers/video/{ => fbdev}/sis/Makefile | 0
drivers/video/{ => fbdev}/sis/init.c | 0
drivers/video/{ => fbdev}/sis/init.h | 0
drivers/video/{ => fbdev}/sis/init301.c | 0
drivers/video/{ => fbdev}/sis/init301.h | 0
drivers/video/{ => fbdev}/sis/initdef.h | 0
drivers/video/{ => fbdev}/sis/initextlfb.c | 0
drivers/video/{ => fbdev}/sis/oem300.h | 0
drivers/video/{ => fbdev}/sis/oem310.h | 0
drivers/video/{ => fbdev}/sis/sis.h | 0
drivers/video/{ => fbdev}/sis/sis_accel.c | 0
drivers/video/{ => fbdev}/sis/sis_accel.h | 0
drivers/video/{ => fbdev}/sis/sis_main.c | 0
drivers/video/{ => fbdev}/sis/sis_main.h | 0
drivers/video/{ => fbdev}/sis/vgatypes.h | 0
drivers/video/{ => fbdev}/sis/vstruct.h | 0
drivers/video/{ => fbdev}/skeletonfb.c | 0
drivers/video/{ => fbdev}/sm501fb.c | 0
drivers/video/{ => fbdev}/smscufx.c | 0
drivers/video/{ => fbdev}/ssd1307fb.c | 0
drivers/video/{ => fbdev}/sstfb.c | 0
drivers/video/{ => fbdev}/sticore.h | 0
drivers/video/{ => fbdev}/stifb.c | 0
drivers/video/{ => fbdev}/sunxvr1000.c | 0
drivers/video/{ => fbdev}/sunxvr2500.c | 0
drivers/video/{ => fbdev}/sunxvr500.c | 0
drivers/video/{ => fbdev}/tcx.c | 0
drivers/video/{ => fbdev}/tdfxfb.c | 0
drivers/video/{ => fbdev}/tgafb.c | 0
drivers/video/{ => fbdev}/tmiofb.c | 0
drivers/video/{ => fbdev}/tridentfb.c | 0
drivers/video/{ => fbdev}/udlfb.c | 0
drivers/video/{ => fbdev}/uvesafb.c | 0
drivers/video/{ => fbdev}/valkyriefb.c | 0
drivers/video/{ => fbdev}/valkyriefb.h | 0
drivers/video/{ => fbdev}/vermilion/Makefile | 0
drivers/video/{ => fbdev}/vermilion/cr_pll.c | 0
drivers/video/{ => fbdev}/vermilion/vermilion.c | 0
drivers/video/{ => fbdev}/vermilion/vermilion.h | 0
drivers/video/{ => fbdev}/vesafb.c | 0
drivers/video/{ => fbdev}/vfb.c | 0
drivers/video/{ => fbdev}/vga16fb.c | 0
drivers/video/{ => fbdev}/via/Makefile | 0
drivers/video/{ => fbdev}/via/accel.c | 0
drivers/video/{ => fbdev}/via/accel.h | 0
drivers/video/{ => fbdev}/via/chip.h | 0
drivers/video/{ => fbdev}/via/debug.h | 0
drivers/video/{ => fbdev}/via/dvi.c | 0
drivers/video/{ => fbdev}/via/dvi.h | 0
drivers/video/{ => fbdev}/via/global.c | 0
drivers/video/{ => fbdev}/via/global.h | 0
drivers/video/{ => fbdev}/via/hw.c | 0
drivers/video/{ => fbdev}/via/hw.h | 0
drivers/video/{ => fbdev}/via/ioctl.c | 0
drivers/video/{ => fbdev}/via/ioctl.h | 0
drivers/video/{ => fbdev}/via/lcd.c | 0
drivers/video/{ => fbdev}/via/lcd.h | 0
drivers/video/{ => fbdev}/via/share.h | 0
drivers/video/{ => fbdev}/via/tblDPASetting.c | 0
drivers/video/{ => fbdev}/via/tblDPASetting.h | 0
drivers/video/{ => fbdev}/via/via-core.c | 0
drivers/video/{ => fbdev}/via/via-gpio.c | 0
drivers/video/{ => fbdev}/via/via_aux.c | 0
drivers/video/{ => fbdev}/via/via_aux.h | 0
drivers/video/{ => fbdev}/via/via_aux_ch7301.c | 0
drivers/video/{ => fbdev}/via/via_aux_edid.c | 0
drivers/video/{ => fbdev}/via/via_aux_sii164.c | 0
drivers/video/{ => fbdev}/via/via_aux_vt1621.c | 0
drivers/video/{ => fbdev}/via/via_aux_vt1622.c | 0
drivers/video/{ => fbdev}/via/via_aux_vt1625.c | 0
drivers/video/{ => fbdev}/via/via_aux_vt1631.c | 0
drivers/video/{ => fbdev}/via/via_aux_vt1632.c | 0
drivers/video/{ => fbdev}/via/via_aux_vt1636.c | 0
drivers/video/{ => fbdev}/via/via_clock.c | 0
drivers/video/{ => fbdev}/via/via_clock.h | 0
drivers/video/{ => fbdev}/via/via_i2c.c | 0
drivers/video/{ => fbdev}/via/via_modesetting.c | 0
drivers/video/{ => fbdev}/via/via_modesetting.h | 0
drivers/video/{ => fbdev}/via/via_utility.c | 0
drivers/video/{ => fbdev}/via/via_utility.h | 0
drivers/video/{ => fbdev}/via/viafbdev.c | 0
drivers/video/{ => fbdev}/via/viafbdev.h | 0
drivers/video/{ => fbdev}/via/viamode.c | 0
drivers/video/{ => fbdev}/via/viamode.h | 0
drivers/video/{ => fbdev}/via/vt1636.c | 0
drivers/video/{ => fbdev}/via/vt1636.h | 0
drivers/video/{ => fbdev}/vt8500lcdfb.c | 0
drivers/video/{ => fbdev}/vt8500lcdfb.h | 0
drivers/video/{ => fbdev}/vt8623fb.c | 0
drivers/video/{ => fbdev}/w100fb.c | 0
drivers/video/{ => fbdev}/w100fb.h | 0
drivers/video/{ => fbdev}/wm8505fb.c | 0
drivers/video/{ => fbdev}/wm8505fb_regs.h | 0
drivers/video/{ => fbdev}/wmt_ge_rops.c | 2 +-
drivers/video/{ => fbdev}/wmt_ge_rops.h | 0
drivers/video/{ => fbdev}/xen-fbfront.c | 0
drivers/video/{ => fbdev}/xilinxfb.c | 0
drivers/video/omap2/Kconfig | 10 -
486 files changed, 2690 insertions(+), 2673 deletions(-)
rename drivers/video/{ => fbdev}/68328fb.c (100%)
create mode 100644 drivers/video/fbdev/Kconfig
create mode 100644 drivers/video/fbdev/Makefile
rename drivers/video/{ => fbdev}/acornfb.c (100%)
rename drivers/video/{ => fbdev}/acornfb.h (100%)
rename drivers/video/{ => fbdev}/amba-clcd.c (100%)
rename drivers/video/{ => fbdev}/amifb.c (100%)
rename drivers/video/{ => fbdev}/arcfb.c (100%)
rename drivers/video/{ => fbdev}/arkfb.c (100%)
rename drivers/video/{ => fbdev}/asiliantfb.c (100%)
rename drivers/video/{ => fbdev}/atafb.c (100%)
rename drivers/video/{ => fbdev}/atafb.h (100%)
rename drivers/video/{ => fbdev}/atafb_iplan2p2.c (100%)
rename drivers/video/{ => fbdev}/atafb_iplan2p4.c (100%)
rename drivers/video/{ => fbdev}/atafb_iplan2p8.c (100%)
rename drivers/video/{ => fbdev}/atafb_mfb.c (100%)
rename drivers/video/{ => fbdev}/atafb_utils.h (100%)
rename drivers/video/{ => fbdev}/atmel_lcdfb.c (100%)
rename drivers/video/{ => fbdev}/aty/Makefile (100%)
rename drivers/video/{ => fbdev}/aty/ati_ids.h (100%)
rename drivers/video/{ => fbdev}/aty/aty128fb.c (100%)
rename drivers/video/{ => fbdev}/aty/atyfb.h (100%)
rename drivers/video/{ => fbdev}/aty/atyfb_base.c (100%)
rename drivers/video/{ => fbdev}/aty/mach64_accel.c (100%)
rename drivers/video/{ => fbdev}/aty/mach64_ct.c (100%)
rename drivers/video/{ => fbdev}/aty/mach64_cursor.c (100%)
rename drivers/video/{ => fbdev}/aty/mach64_gx.c (100%)
rename drivers/video/{ => fbdev}/aty/radeon_accel.c (100%)
rename drivers/video/{ => fbdev}/aty/radeon_backlight.c (100%)
rename drivers/video/{ => fbdev}/aty/radeon_base.c (100%)
rename drivers/video/{ => fbdev}/aty/radeon_i2c.c (100%)
rename drivers/video/{ => fbdev}/aty/radeon_monitor.c (100%)
rename drivers/video/{ => fbdev}/aty/radeon_pm.c (100%)
rename drivers/video/{ => fbdev}/aty/radeonfb.h (100%)
rename drivers/video/{ => fbdev}/au1100fb.c (100%)
rename drivers/video/{ => fbdev}/au1100fb.h (100%)
rename drivers/video/{ => fbdev}/au1200fb.c (100%)
rename drivers/video/{ => fbdev}/au1200fb.h (100%)
rename drivers/video/{ => fbdev}/auo_k1900fb.c (100%)
rename drivers/video/{ => fbdev}/auo_k1901fb.c (100%)
rename drivers/video/{ => fbdev}/auo_k190x.c (100%)
rename drivers/video/{ => fbdev}/auo_k190x.h (100%)
rename drivers/video/{ => fbdev}/bf537-lq035.c (100%)
rename drivers/video/{ => fbdev}/bf54x-lq043fb.c (100%)
rename drivers/video/{ => fbdev}/bfin-lq035q1-fb.c (100%)
rename drivers/video/{ => fbdev}/bfin-t350mcqb-fb.c (100%)
rename drivers/video/{ => fbdev}/bfin_adv7393fb.c (100%)
rename drivers/video/{ => fbdev}/bfin_adv7393fb.h (100%)
rename drivers/video/{ => fbdev}/broadsheetfb.c (100%)
rename drivers/video/{ => fbdev}/bt431.h (100%)
rename drivers/video/{ => fbdev}/bt455.h (100%)
rename drivers/video/{ => fbdev}/bw2.c (100%)
rename drivers/video/{ => fbdev}/c2p.h (100%)
rename drivers/video/{ => fbdev}/c2p_core.h (100%)
rename drivers/video/{ => fbdev}/c2p_iplan2.c (100%)
rename drivers/video/{ => fbdev}/c2p_planar.c (100%)
rename drivers/video/{ => fbdev}/carminefb.c (100%)
rename drivers/video/{ => fbdev}/carminefb.h (100%)
rename drivers/video/{ => fbdev}/carminefb_regs.h (100%)
rename drivers/video/{ => fbdev}/cg14.c (100%)
rename drivers/video/{ => fbdev}/cg3.c (100%)
rename drivers/video/{ => fbdev}/cg6.c (100%)
rename drivers/video/{ => fbdev}/chipsfb.c (100%)
rename drivers/video/{ => fbdev}/cirrusfb.c (100%)
rename drivers/video/{ => fbdev}/clps711xfb.c (100%)
rename drivers/video/{ => fbdev}/cobalt_lcdfb.c (100%)
rename drivers/video/{ => fbdev}/controlfb.c (100%)
rename drivers/video/{ => fbdev}/controlfb.h (100%)
create mode 100644 drivers/video/fbdev/core/Makefile
rename drivers/video/{ => fbdev/core}/cfbcopyarea.c (100%)
rename drivers/video/{ => fbdev/core}/cfbfillrect.c (100%)
rename drivers/video/{ => fbdev/core}/cfbimgblt.c (100%)
rename drivers/video/{ => fbdev/core}/fb_ddc.c (99%)
rename drivers/video/{ => fbdev/core}/fb_defio.c (100%)
rename drivers/video/{ => fbdev/core}/fb_draw.h (100%)
rename drivers/video/{ => fbdev/core}/fb_notify.c (100%)
rename drivers/video/{ => fbdev/core}/fb_sys_fops.c (100%)
rename drivers/video/{ => fbdev/core}/fbcmap.c (100%)
rename drivers/video/{ => fbdev/core}/fbcvt.c (100%)
rename drivers/video/{ => fbdev/core}/fbmem.c (100%)
rename drivers/video/{ => fbdev/core}/fbmon.c (99%)
rename drivers/video/{ => fbdev/core}/fbsysfs.c (100%)
rename drivers/video/{ => fbdev/core}/modedb.c (100%)
rename drivers/video/{ => fbdev/core}/svgalib.c (100%)
rename drivers/video/{ => fbdev/core}/syscopyarea.c (100%)
rename drivers/video/{ => fbdev/core}/sysfillrect.c (100%)
rename drivers/video/{ => fbdev/core}/sysimgblt.c (100%)
rename drivers/video/{ => fbdev}/cyber2000fb.c (100%)
rename drivers/video/{ => fbdev}/cyber2000fb.h (100%)
rename drivers/video/{ => fbdev}/da8xx-fb.c (100%)
rename drivers/video/{ => fbdev}/dnfb.c (100%)
rename drivers/video/{ => fbdev}/edid.h (100%)
rename drivers/video/{ => fbdev}/efifb.c (100%)
rename drivers/video/{ => fbdev}/ep93xx-fb.c (100%)
rename drivers/video/{ => fbdev}/exynos/Kconfig (100%)
rename drivers/video/{ => fbdev}/exynos/Makefile (100%)
rename drivers/video/{ => fbdev}/exynos/exynos_dp_core.c (100%)
rename drivers/video/{ => fbdev}/exynos/exynos_dp_core.h (100%)
rename drivers/video/{ => fbdev}/exynos/exynos_dp_reg.c (100%)
rename drivers/video/{ => fbdev}/exynos/exynos_dp_reg.h (100%)
rename drivers/video/{ => fbdev}/exynos/exynos_mipi_dsi.c (100%)
rename drivers/video/{ => fbdev}/exynos/exynos_mipi_dsi_common.c (100%)
rename drivers/video/{ => fbdev}/exynos/exynos_mipi_dsi_common.h (100%)
rename drivers/video/{ => fbdev}/exynos/exynos_mipi_dsi_lowlevel.c (100%)
rename drivers/video/{ => fbdev}/exynos/exynos_mipi_dsi_lowlevel.h (100%)
rename drivers/video/{ => fbdev}/exynos/exynos_mipi_dsi_regs.h (100%)
rename drivers/video/{ => fbdev}/exynos/s6e8ax0.c (100%)
rename drivers/video/{ => fbdev}/fb-puv3.c (100%)
rename drivers/video/{ => fbdev}/ffb.c (100%)
rename drivers/video/{ => fbdev}/fm2fb.c (100%)
rename drivers/video/{ => fbdev}/fsl-diu-fb.c (100%)
rename drivers/video/{ => fbdev}/g364fb.c (100%)
rename drivers/video/{ => fbdev}/gbefb.c (100%)
rename drivers/video/{ => fbdev}/geode/Kconfig (100%)
rename drivers/video/{ => fbdev}/geode/Makefile (100%)
rename drivers/video/{ => fbdev}/geode/display_gx.c (100%)
rename drivers/video/{ => fbdev}/geode/display_gx1.c (100%)
rename drivers/video/{ => fbdev}/geode/display_gx1.h (100%)
rename drivers/video/{ => fbdev}/geode/geodefb.h (100%)
rename drivers/video/{ => fbdev}/geode/gx1fb_core.c (100%)
rename drivers/video/{ => fbdev}/geode/gxfb.h (100%)
rename drivers/video/{ => fbdev}/geode/gxfb_core.c (100%)
rename drivers/video/{ => fbdev}/geode/lxfb.h (100%)
rename drivers/video/{ => fbdev}/geode/lxfb_core.c (100%)
rename drivers/video/{ => fbdev}/geode/lxfb_ops.c (100%)
rename drivers/video/{ => fbdev}/geode/suspend_gx.c (100%)
rename drivers/video/{ => fbdev}/geode/video_cs5530.c (100%)
rename drivers/video/{ => fbdev}/geode/video_cs5530.h (100%)
rename drivers/video/{ => fbdev}/geode/video_gx.c (100%)
rename drivers/video/{ => fbdev}/goldfishfb.c (100%)
rename drivers/video/{ => fbdev}/grvga.c (100%)
rename drivers/video/{ => fbdev}/gxt4500.c (100%)
rename drivers/video/{ => fbdev}/hecubafb.c (100%)
rename drivers/video/{ => fbdev}/hgafb.c (100%)
rename drivers/video/{ => fbdev}/hitfb.c (100%)
rename drivers/video/{ => fbdev}/hpfb.c (100%)
rename drivers/video/{ => fbdev}/hyperv_fb.c (100%)
rename drivers/video/{ => fbdev}/i740_reg.h (100%)
rename drivers/video/{ => fbdev}/i740fb.c (100%)
rename drivers/video/{ => fbdev}/i810/Makefile (100%)
rename drivers/video/{ => fbdev}/i810/i810-i2c.c (100%)
rename drivers/video/{ => fbdev}/i810/i810.h (100%)
rename drivers/video/{ => fbdev}/i810/i810_accel.c (100%)
rename drivers/video/{ => fbdev}/i810/i810_dvt.c (100%)
rename drivers/video/{ => fbdev}/i810/i810_gtf.c (100%)
rename drivers/video/{ => fbdev}/i810/i810_main.c (100%)
rename drivers/video/{ => fbdev}/i810/i810_main.h (100%)
rename drivers/video/{ => fbdev}/i810/i810_regs.h (100%)
rename drivers/video/{ => fbdev}/igafb.c (100%)
rename drivers/video/{ => fbdev}/imsttfb.c (100%)
rename drivers/video/{ => fbdev}/imxfb.c (100%)
rename drivers/video/{ => fbdev}/intelfb/Makefile (100%)
rename drivers/video/{ => fbdev}/intelfb/intelfb.h (100%)
rename drivers/video/{ => fbdev}/intelfb/intelfb_i2c.c (100%)
rename drivers/video/{ => fbdev}/intelfb/intelfbdrv.c (100%)
rename drivers/video/{ => fbdev}/intelfb/intelfbhw.c (100%)
rename drivers/video/{ => fbdev}/intelfb/intelfbhw.h (100%)
rename drivers/video/{ => fbdev}/jz4740_fb.c (100%)
rename drivers/video/{ => fbdev}/kyro/Makefile (100%)
rename drivers/video/{ => fbdev}/kyro/STG4000InitDevice.c (100%)
rename drivers/video/{ => fbdev}/kyro/STG4000Interface.h (100%)
rename drivers/video/{ => fbdev}/kyro/STG4000OverlayDevice.c (100%)
rename drivers/video/{ => fbdev}/kyro/STG4000Ramdac.c (100%)
rename drivers/video/{ => fbdev}/kyro/STG4000Reg.h (100%)
rename drivers/video/{ => fbdev}/kyro/STG4000VTG.c (100%)
rename drivers/video/{ => fbdev}/kyro/fbdev.c (100%)
rename drivers/video/{ => fbdev}/leo.c (100%)
rename drivers/video/{ => fbdev}/macfb.c (100%)
rename drivers/video/{ => fbdev}/macmodes.c (100%)
rename drivers/video/{ => fbdev}/macmodes.h (100%)
rename drivers/video/{ => fbdev}/matrox/Makefile (100%)
rename drivers/video/{ => fbdev}/matrox/g450_pll.c (100%)
rename drivers/video/{ => fbdev}/matrox/g450_pll.h (100%)
rename drivers/video/{ => fbdev}/matrox/i2c-matroxfb.c (100%)
rename drivers/video/{ => fbdev}/matrox/matroxfb_DAC1064.c (100%)
rename drivers/video/{ => fbdev}/matrox/matroxfb_DAC1064.h (100%)
rename drivers/video/{ => fbdev}/matrox/matroxfb_Ti3026.c (100%)
rename drivers/video/{ => fbdev}/matrox/matroxfb_Ti3026.h (100%)
rename drivers/video/{ => fbdev}/matrox/matroxfb_accel.c (100%)
rename drivers/video/{ => fbdev}/matrox/matroxfb_accel.h (100%)
rename drivers/video/{ => fbdev}/matrox/matroxfb_base.c (100%)
rename drivers/video/{ => fbdev}/matrox/matroxfb_base.h (100%)
rename drivers/video/{ => fbdev}/matrox/matroxfb_crtc2.c (100%)
rename drivers/video/{ => fbdev}/matrox/matroxfb_crtc2.h (100%)
rename drivers/video/{ => fbdev}/matrox/matroxfb_g450.c (100%)
rename drivers/video/{ => fbdev}/matrox/matroxfb_g450.h (100%)
rename drivers/video/{ => fbdev}/matrox/matroxfb_maven.c (100%)
rename drivers/video/{ => fbdev}/matrox/matroxfb_maven.h (100%)
rename drivers/video/{ => fbdev}/matrox/matroxfb_misc.c (100%)
rename drivers/video/{ => fbdev}/matrox/matroxfb_misc.h (100%)
rename drivers/video/{ => fbdev}/maxinefb.c (100%)
rename drivers/video/{ => fbdev}/mb862xx/Makefile (100%)
rename drivers/video/{ => fbdev}/mb862xx/mb862xx-i2c.c (100%)
rename drivers/video/{ => fbdev}/mb862xx/mb862xx_reg.h (100%)
rename drivers/video/{ => fbdev}/mb862xx/mb862xxfb.h (100%)
rename drivers/video/{ => fbdev}/mb862xx/mb862xxfb_accel.c (100%)
rename drivers/video/{ => fbdev}/mb862xx/mb862xxfb_accel.h (100%)
rename drivers/video/{ => fbdev}/mb862xx/mb862xxfbdrv.c (100%)
rename drivers/video/{ => fbdev}/mbx/Makefile (100%)
rename drivers/video/{ => fbdev}/mbx/mbxdebugfs.c (100%)
rename drivers/video/{ => fbdev}/mbx/mbxfb.c (100%)
rename drivers/video/{ => fbdev}/mbx/reg_bits.h (100%)
rename drivers/video/{ => fbdev}/mbx/regs.h (100%)
rename drivers/video/{ => fbdev}/metronomefb.c (100%)
rename drivers/video/{ => fbdev}/mmp/Kconfig (61%)
rename drivers/video/{ => fbdev}/mmp/Makefile (100%)
rename drivers/video/{ => fbdev}/mmp/core.c (100%)
rename drivers/video/{ => fbdev}/mmp/fb/Kconfig (100%)
rename drivers/video/{ => fbdev}/mmp/fb/Makefile (100%)
rename drivers/video/{ => fbdev}/mmp/fb/mmpfb.c (100%)
rename drivers/video/{ => fbdev}/mmp/fb/mmpfb.h (100%)
rename drivers/video/{ => fbdev}/mmp/hw/Kconfig (100%)
rename drivers/video/{ => fbdev}/mmp/hw/Makefile (100%)
rename drivers/video/{ => fbdev}/mmp/hw/mmp_ctrl.c (100%)
rename drivers/video/{ => fbdev}/mmp/hw/mmp_ctrl.h (100%)
rename drivers/video/{ => fbdev}/mmp/hw/mmp_spi.c (100%)
rename drivers/video/{ => fbdev}/mmp/panel/Kconfig (100%)
rename drivers/video/{ => fbdev}/mmp/panel/Makefile (100%)
rename drivers/video/{ => fbdev}/mmp/panel/tpo_tj032md01bw.c (100%)
rename drivers/video/{ => fbdev}/msm/Makefile (100%)
rename drivers/video/{ => fbdev}/msm/mddi.c (100%)
rename drivers/video/{ => fbdev}/msm/mddi_client_dummy.c (100%)
rename drivers/video/{ => fbdev}/msm/mddi_client_nt35399.c (100%)
rename drivers/video/{ => fbdev}/msm/mddi_client_toshiba.c (100%)
rename drivers/video/{ => fbdev}/msm/mddi_hw.h (100%)
rename drivers/video/{ => fbdev}/msm/mdp.c (100%)
rename drivers/video/{ => fbdev}/msm/mdp_csc_table.h (100%)
rename drivers/video/{ => fbdev}/msm/mdp_hw.h (100%)
rename drivers/video/{ => fbdev}/msm/mdp_ppp.c (100%)
rename drivers/video/{ => fbdev}/msm/mdp_scale_tables.c (100%)
rename drivers/video/{ => fbdev}/msm/mdp_scale_tables.h (100%)
rename drivers/video/{ => fbdev}/msm/msm_fb.c (100%)
rename drivers/video/{ => fbdev}/mx3fb.c (100%)
rename drivers/video/{ => fbdev}/mxsfb.c (100%)
rename drivers/video/{ => fbdev}/n411.c (100%)
rename drivers/video/{ => fbdev}/neofb.c (100%)
rename drivers/video/{ => fbdev}/nuc900fb.c (100%)
rename drivers/video/{ => fbdev}/nuc900fb.h (100%)
rename drivers/video/{ => fbdev}/nvidia/Makefile (100%)
rename drivers/video/{ => fbdev}/nvidia/nv_accel.c (100%)
rename drivers/video/{ => fbdev}/nvidia/nv_backlight.c (100%)
rename drivers/video/{ => fbdev}/nvidia/nv_dma.h (100%)
rename drivers/video/{ => fbdev}/nvidia/nv_hw.c (100%)
rename drivers/video/{ => fbdev}/nvidia/nv_i2c.c (100%)
rename drivers/video/{ => fbdev}/nvidia/nv_local.h (100%)
rename drivers/video/{ => fbdev}/nvidia/nv_of.c (100%)
rename drivers/video/{ => fbdev}/nvidia/nv_proto.h (100%)
rename drivers/video/{ => fbdev}/nvidia/nv_setup.c (100%)
rename drivers/video/{ => fbdev}/nvidia/nv_type.h (100%)
rename drivers/video/{ => fbdev}/nvidia/nvidia.c (100%)
rename drivers/video/{ => fbdev}/ocfb.c (100%)
rename drivers/video/{ => fbdev}/offb.c (100%)
rename drivers/video/{ => fbdev}/omap/Kconfig (100%)
rename drivers/video/{ => fbdev}/omap/Makefile (100%)
rename drivers/video/{ => fbdev}/omap/hwa742.c (100%)
rename drivers/video/{ => fbdev}/omap/lcd_ams_delta.c (100%)
rename drivers/video/{ => fbdev}/omap/lcd_h3.c (100%)
rename drivers/video/{ => fbdev}/omap/lcd_htcherald.c (100%)
rename drivers/video/{ => fbdev}/omap/lcd_inn1510.c (100%)
rename drivers/video/{ => fbdev}/omap/lcd_inn1610.c (100%)
rename drivers/video/{ => fbdev}/omap/lcd_mipid.c (100%)
rename drivers/video/{ => fbdev}/omap/lcd_osk.c (100%)
rename drivers/video/{ => fbdev}/omap/lcd_palmte.c (100%)
rename drivers/video/{ => fbdev}/omap/lcd_palmtt.c (100%)
rename drivers/video/{ => fbdev}/omap/lcd_palmz71.c (100%)
rename drivers/video/{ => fbdev}/omap/lcdc.c (100%)
rename drivers/video/{ => fbdev}/omap/lcdc.h (100%)
rename drivers/video/{ => fbdev}/omap/omapfb.h (100%)
rename drivers/video/{ => fbdev}/omap/omapfb_main.c (100%)
rename drivers/video/{ => fbdev}/omap/sossi.c (100%)
create mode 100644 drivers/video/fbdev/omap2/Kconfig
rename drivers/video/{ => fbdev}/omap2/Makefile (100%)
rename drivers/video/{ => fbdev}/omap2/displays-new/Kconfig (100%)
rename drivers/video/{ => fbdev}/omap2/displays-new/Makefile (100%)
rename drivers/video/{ => fbdev}/omap2/displays-new/connector-analog-tv.c (100%)
rename drivers/video/{ => fbdev}/omap2/displays-new/connector-dvi.c (100%)
rename drivers/video/{ => fbdev}/omap2/displays-new/connector-hdmi.c (100%)
rename drivers/video/{ => fbdev}/omap2/displays-new/encoder-tfp410.c (100%)
rename drivers/video/{ => fbdev}/omap2/displays-new/encoder-tpd12s015.c (100%)
rename drivers/video/{ => fbdev}/omap2/displays-new/panel-dpi.c (100%)
rename drivers/video/{ => fbdev}/omap2/displays-new/panel-dsi-cm.c (100%)
rename drivers/video/{ => fbdev}/omap2/displays-new/panel-lgphilips-lb035q02.c (100%)
rename drivers/video/{ => fbdev}/omap2/displays-new/panel-nec-nl8048hl11.c (100%)
rename drivers/video/{ => fbdev}/omap2/displays-new/panel-sharp-ls037v7dw01.c (100%)
rename drivers/video/{ => fbdev}/omap2/displays-new/panel-sony-acx565akm.c (100%)
rename drivers/video/{ => fbdev}/omap2/displays-new/panel-tpo-td028ttec1.c (100%)
rename drivers/video/{ => fbdev}/omap2/displays-new/panel-tpo-td043mtea1.c (100%)
rename drivers/video/{ => fbdev}/omap2/dss/Kconfig (100%)
rename drivers/video/{ => fbdev}/omap2/dss/Makefile (100%)
rename drivers/video/{ => fbdev}/omap2/dss/apply.c (100%)
rename drivers/video/{ => fbdev}/omap2/dss/core.c (100%)
rename drivers/video/{ => fbdev}/omap2/dss/dispc-compat.c (100%)
rename drivers/video/{ => fbdev}/omap2/dss/dispc-compat.h (100%)
rename drivers/video/{ => fbdev}/omap2/dss/dispc.c (100%)
rename drivers/video/{ => fbdev}/omap2/dss/dispc.h (100%)
rename drivers/video/{ => fbdev}/omap2/dss/dispc_coefs.c (100%)
rename drivers/video/{ => fbdev}/omap2/dss/display-sysfs.c (100%)
rename drivers/video/{ => fbdev}/omap2/dss/display.c (100%)
rename drivers/video/{ => fbdev}/omap2/dss/dpi.c (100%)
rename drivers/video/{ => fbdev}/omap2/dss/dsi.c (100%)
rename drivers/video/{ => fbdev}/omap2/dss/dss.c (100%)
rename drivers/video/{ => fbdev}/omap2/dss/dss.h (100%)
rename drivers/video/{ => fbdev}/omap2/dss/dss_features.c (100%)
rename drivers/video/{ => fbdev}/omap2/dss/dss_features.h (100%)
rename drivers/video/{ => fbdev}/omap2/dss/hdmi.h (100%)
rename drivers/video/{ => fbdev}/omap2/dss/hdmi4.c (100%)
rename drivers/video/{ => fbdev}/omap2/dss/hdmi4_core.c (100%)
rename drivers/video/{ => fbdev}/omap2/dss/hdmi4_core.h (100%)
rename drivers/video/{ => fbdev}/omap2/dss/hdmi_common.c (100%)
rename drivers/video/{ => fbdev}/omap2/dss/hdmi_phy.c (100%)
rename drivers/video/{ => fbdev}/omap2/dss/hdmi_pll.c (100%)
rename drivers/video/{ => fbdev}/omap2/dss/hdmi_wp.c (100%)
rename drivers/video/{ => fbdev}/omap2/dss/manager-sysfs.c (100%)
rename drivers/video/{ => fbdev}/omap2/dss/manager.c (100%)
rename drivers/video/{ => fbdev}/omap2/dss/output.c (100%)
rename drivers/video/{ => fbdev}/omap2/dss/overlay-sysfs.c (100%)
rename drivers/video/{ => fbdev}/omap2/dss/overlay.c (100%)
rename drivers/video/{ => fbdev}/omap2/dss/rfbi.c (100%)
rename drivers/video/{ => fbdev}/omap2/dss/sdi.c (100%)
rename drivers/video/{ => fbdev}/omap2/dss/venc.c (100%)
rename drivers/video/{ => fbdev}/omap2/dss/venc_panel.c (100%)
rename drivers/video/{ => fbdev}/omap2/omapfb/Kconfig (100%)
rename drivers/video/{ => fbdev}/omap2/omapfb/Makefile (100%)
rename drivers/video/{ => fbdev}/omap2/omapfb/omapfb-ioctl.c (100%)
rename drivers/video/{ => fbdev}/omap2/omapfb/omapfb-main.c (100%)
rename drivers/video/{ => fbdev}/omap2/omapfb/omapfb-sysfs.c (100%)
rename drivers/video/{ => fbdev}/omap2/omapfb/omapfb.h (100%)
rename drivers/video/{ => fbdev}/omap2/vrfb.c (100%)
rename drivers/video/{ => fbdev}/p9100.c (100%)
rename drivers/video/{ => fbdev}/platinumfb.c (100%)
rename drivers/video/{ => fbdev}/platinumfb.h (100%)
rename drivers/video/{ => fbdev}/pm2fb.c (100%)
rename drivers/video/{ => fbdev}/pm3fb.c (100%)
rename drivers/video/{ => fbdev}/pmag-aa-fb.c (100%)
rename drivers/video/{ => fbdev}/pmag-ba-fb.c (100%)
rename drivers/video/{ => fbdev}/pmagb-b-fb.c (100%)
rename drivers/video/{ => fbdev}/ps3fb.c (100%)
rename drivers/video/{ => fbdev}/pvr2fb.c (100%)
rename drivers/video/{ => fbdev}/pxa168fb.c (100%)
rename drivers/video/{ => fbdev}/pxa168fb.h (100%)
rename drivers/video/{ => fbdev}/pxa3xx-gcu.c (100%)
rename drivers/video/{ => fbdev}/pxa3xx-gcu.h (100%)
rename drivers/video/{ => fbdev}/pxafb.c (100%)
rename drivers/video/{ => fbdev}/pxafb.h (100%)
rename drivers/video/{ => fbdev}/q40fb.c (100%)
rename drivers/video/{ => fbdev}/riva/Makefile (100%)
rename drivers/video/{ => fbdev}/riva/fbdev.c (100%)
rename drivers/video/{ => fbdev}/riva/nv_driver.c (100%)
rename drivers/video/{ => fbdev}/riva/nv_type.h (100%)
rename drivers/video/{ => fbdev}/riva/nvreg.h (100%)
rename drivers/video/{ => fbdev}/riva/riva_hw.c (100%)
rename drivers/video/{ => fbdev}/riva/riva_hw.h (100%)
rename drivers/video/{ => fbdev}/riva/riva_tbl.h (100%)
rename drivers/video/{ => fbdev}/riva/rivafb-i2c.c (100%)
rename drivers/video/{ => fbdev}/riva/rivafb.h (100%)
rename drivers/video/{ => fbdev}/s1d13xxxfb.c (100%)
rename drivers/video/{ => fbdev}/s3c-fb.c (100%)
rename drivers/video/{ => fbdev}/s3c2410fb.c (100%)
rename drivers/video/{ => fbdev}/s3c2410fb.h (100%)
rename drivers/video/{ => fbdev}/s3fb.c (100%)
rename drivers/video/{ => fbdev}/sa1100fb.c (100%)
rename drivers/video/{ => fbdev}/sa1100fb.h (100%)
rename drivers/video/{ => fbdev}/savage/Makefile (100%)
rename drivers/video/{ => fbdev}/savage/savagefb-i2c.c (100%)
rename drivers/video/{ => fbdev}/savage/savagefb.h (100%)
rename drivers/video/{ => fbdev}/savage/savagefb_accel.c (100%)
rename drivers/video/{ => fbdev}/savage/savagefb_driver.c (100%)
rename drivers/video/{ => fbdev}/sbuslib.c (100%)
rename drivers/video/{ => fbdev}/sbuslib.h (100%)
rename drivers/video/{ => fbdev}/sgivwfb.c (100%)
rename drivers/video/{ => fbdev}/sh7760fb.c (100%)
rename drivers/video/{ => fbdev}/sh_mipi_dsi.c (100%)
rename drivers/video/{ => fbdev}/sh_mobile_hdmi.c (100%)
rename drivers/video/{ => fbdev}/sh_mobile_lcdcfb.c (100%)
rename drivers/video/{ => fbdev}/sh_mobile_lcdcfb.h (100%)
rename drivers/video/{ => fbdev}/sh_mobile_meram.c (100%)
rename drivers/video/{ => fbdev}/simplefb.c (100%)
rename drivers/video/{ => fbdev}/sis/300vtbl.h (100%)
rename drivers/video/{ => fbdev}/sis/310vtbl.h (100%)
rename drivers/video/{ => fbdev}/sis/Makefile (100%)
rename drivers/video/{ => fbdev}/sis/init.c (100%)
rename drivers/video/{ => fbdev}/sis/init.h (100%)
rename drivers/video/{ => fbdev}/sis/init301.c (100%)
rename drivers/video/{ => fbdev}/sis/init301.h (100%)
rename drivers/video/{ => fbdev}/sis/initdef.h (100%)
rename drivers/video/{ => fbdev}/sis/initextlfb.c (100%)
rename drivers/video/{ => fbdev}/sis/oem300.h (100%)
rename drivers/video/{ => fbdev}/sis/oem310.h (100%)
rename drivers/video/{ => fbdev}/sis/sis.h (100%)
rename drivers/video/{ => fbdev}/sis/sis_accel.c (100%)
rename drivers/video/{ => fbdev}/sis/sis_accel.h (100%)
rename drivers/video/{ => fbdev}/sis/sis_main.c (100%)
rename drivers/video/{ => fbdev}/sis/sis_main.h (100%)
rename drivers/video/{ => fbdev}/sis/vgatypes.h (100%)
rename drivers/video/{ => fbdev}/sis/vstruct.h (100%)
rename drivers/video/{ => fbdev}/skeletonfb.c (100%)
rename drivers/video/{ => fbdev}/sm501fb.c (100%)
rename drivers/video/{ => fbdev}/smscufx.c (100%)
rename drivers/video/{ => fbdev}/ssd1307fb.c (100%)
rename drivers/video/{ => fbdev}/sstfb.c (100%)
rename drivers/video/{ => fbdev}/sticore.h (100%)
rename drivers/video/{ => fbdev}/stifb.c (100%)
rename drivers/video/{ => fbdev}/sunxvr1000.c (100%)
rename drivers/video/{ => fbdev}/sunxvr2500.c (100%)
rename drivers/video/{ => fbdev}/sunxvr500.c (100%)
rename drivers/video/{ => fbdev}/tcx.c (100%)
rename drivers/video/{ => fbdev}/tdfxfb.c (100%)
rename drivers/video/{ => fbdev}/tgafb.c (100%)
rename drivers/video/{ => fbdev}/tmiofb.c (100%)
rename drivers/video/{ => fbdev}/tridentfb.c (100%)
rename drivers/video/{ => fbdev}/udlfb.c (100%)
rename drivers/video/{ => fbdev}/uvesafb.c (100%)
rename drivers/video/{ => fbdev}/valkyriefb.c (100%)
rename drivers/video/{ => fbdev}/valkyriefb.h (100%)
rename drivers/video/{ => fbdev}/vermilion/Makefile (100%)
rename drivers/video/{ => fbdev}/vermilion/cr_pll.c (100%)
rename drivers/video/{ => fbdev}/vermilion/vermilion.c (100%)
rename drivers/video/{ => fbdev}/vermilion/vermilion.h (100%)
rename drivers/video/{ => fbdev}/vesafb.c (100%)
rename drivers/video/{ => fbdev}/vfb.c (100%)
rename drivers/video/{ => fbdev}/vga16fb.c (100%)
rename drivers/video/{ => fbdev}/via/Makefile (100%)
rename drivers/video/{ => fbdev}/via/accel.c (100%)
rename drivers/video/{ => fbdev}/via/accel.h (100%)
rename drivers/video/{ => fbdev}/via/chip.h (100%)
rename drivers/video/{ => fbdev}/via/debug.h (100%)
rename drivers/video/{ => fbdev}/via/dvi.c (100%)
rename drivers/video/{ => fbdev}/via/dvi.h (100%)
rename drivers/video/{ => fbdev}/via/global.c (100%)
rename drivers/video/{ => fbdev}/via/global.h (100%)
rename drivers/video/{ => fbdev}/via/hw.c (100%)
rename drivers/video/{ => fbdev}/via/hw.h (100%)
rename drivers/video/{ => fbdev}/via/ioctl.c (100%)
rename drivers/video/{ => fbdev}/via/ioctl.h (100%)
rename drivers/video/{ => fbdev}/via/lcd.c (100%)
rename drivers/video/{ => fbdev}/via/lcd.h (100%)
rename drivers/video/{ => fbdev}/via/share.h (100%)
rename drivers/video/{ => fbdev}/via/tblDPASetting.c (100%)
rename drivers/video/{ => fbdev}/via/tblDPASetting.h (100%)
rename drivers/video/{ => fbdev}/via/via-core.c (100%)
rename drivers/video/{ => fbdev}/via/via-gpio.c (100%)
rename drivers/video/{ => fbdev}/via/via_aux.c (100%)
rename drivers/video/{ => fbdev}/via/via_aux.h (100%)
rename drivers/video/{ => fbdev}/via/via_aux_ch7301.c (100%)
rename drivers/video/{ => fbdev}/via/via_aux_edid.c (100%)
rename drivers/video/{ => fbdev}/via/via_aux_sii164.c (100%)
rename drivers/video/{ => fbdev}/via/via_aux_vt1621.c (100%)
rename drivers/video/{ => fbdev}/via/via_aux_vt1622.c (100%)
rename drivers/video/{ => fbdev}/via/via_aux_vt1625.c (100%)
rename drivers/video/{ => fbdev}/via/via_aux_vt1631.c (100%)
rename drivers/video/{ => fbdev}/via/via_aux_vt1632.c (100%)
rename drivers/video/{ => fbdev}/via/via_aux_vt1636.c (100%)
rename drivers/video/{ => fbdev}/via/via_clock.c (100%)
rename drivers/video/{ => fbdev}/via/via_clock.h (100%)
rename drivers/video/{ => fbdev}/via/via_i2c.c (100%)
rename drivers/video/{ => fbdev}/via/via_modesetting.c (100%)
rename drivers/video/{ => fbdev}/via/via_modesetting.h (100%)
rename drivers/video/{ => fbdev}/via/via_utility.c (100%)
rename drivers/video/{ => fbdev}/via/via_utility.h (100%)
rename drivers/video/{ => fbdev}/via/viafbdev.c (100%)
rename drivers/video/{ => fbdev}/via/viafbdev.h (100%)
rename drivers/video/{ => fbdev}/via/viamode.c (100%)
rename drivers/video/{ => fbdev}/via/viamode.h (100%)
rename drivers/video/{ => fbdev}/via/vt1636.c (100%)
rename drivers/video/{ => fbdev}/via/vt1636.h (100%)
rename drivers/video/{ => fbdev}/vt8500lcdfb.c (100%)
rename drivers/video/{ => fbdev}/vt8500lcdfb.h (100%)
rename drivers/video/{ => fbdev}/vt8623fb.c (100%)
rename drivers/video/{ => fbdev}/w100fb.c (100%)
rename drivers/video/{ => fbdev}/w100fb.h (100%)
rename drivers/video/{ => fbdev}/wm8505fb.c (100%)
rename drivers/video/{ => fbdev}/wm8505fb_regs.h (100%)
rename drivers/video/{ => fbdev}/wmt_ge_rops.c (99%)
rename drivers/video/{ => fbdev}/wmt_ge_rops.h (100%)
rename drivers/video/{ => fbdev}/xen-fbfront.c (100%)
rename drivers/video/{ => fbdev}/xilinxfb.c (100%)
delete mode 100644 drivers/video/omap2/Kconfig
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [GIT PULL] fbdev reorder for 3.15
2014-04-09 10:48 [GIT PULL] fbdev reorder for 3.15 Tomi Valkeinen
@ 2014-04-09 19:23 ` Linus Torvalds
2014-04-09 23:04 ` Stephen Rothwell
2014-04-10 5:50 ` Tomi Valkeinen
0 siblings, 2 replies; 4+ messages in thread
From: Linus Torvalds @ 2014-04-09 19:23 UTC (permalink / raw)
To: Tomi Valkeinen, Stephen Rothwell
Cc: linux-kernel, linux-fbdev, Jean-Christophe PLAGNIOL-VILLARD
On Wed, Apr 9, 2014 at 3:48 AM, Tomi Valkeinen <tomi.valkeinen@ti.com> wrote:
>
> The patches are based on 3.14-rc4, and cause big conflicts, although the
> conflicts are not complex as such. They are resolved in linux-next, and also in
> my two branches below. The first one contains a resolved merge for your master
> branch, the second one contains rebased patches on top of your master.
Ok, I did the merge, and it wasn't horrid, although it was good that
you had pre-merged and I could double-check because I did miss some
things (that would likely have shown up in my test builds, but maybe
not).
But looking at the reaulting history, I think I will undo the merge
after all, and end up using your rebased branch instead. Simply
because the mixed file movement and other changes during this merge
window just make the end result unnecessarily hard to follow wrt how
the changes happened.
Let me ruminate on this a while. I don't generally like rebasing, but
for something fairly "mindless" like the file rename, it seems a
better option.
Are there other things pending in this area? Because if there are, I
think I'll take you up on your "or we can rebase on top of -rc1" offer
instead.
Linus
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [GIT PULL] fbdev reorder for 3.15
2014-04-09 19:23 ` Linus Torvalds
@ 2014-04-09 23:04 ` Stephen Rothwell
2014-04-10 5:50 ` Tomi Valkeinen
1 sibling, 0 replies; 4+ messages in thread
From: Stephen Rothwell @ 2014-04-09 23:04 UTC (permalink / raw)
To: Linus Torvalds
Cc: Tomi Valkeinen, linux-kernel, linux-fbdev,
Jean-Christophe PLAGNIOL-VILLARD
[-- Attachment #1: Type: text/plain, Size: 2571 bytes --]
Hi Linus,
On Wed, 9 Apr 2014 12:23:47 -0700 Linus Torvalds <torvalds@linux-foundation.org> wrote:
>
> Are there other things pending in this area? Because if there are, I
> think I'll take you up on your "or we can rebase on top of -rc1" offer
> instead.
I have only 2 other commits that touch drivers/video in linux-next and
they are both from Tomi and both only touch a couple of files in
drivers/video/omap2/dss (and drivers/video/fbdev/omap2/dss/ since one of
them is based after the move).
I also have the following merge fix patch in linux-next (maybe you
already have this in the test merge branches):
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 4 Mar 2014 16:11:12 +1100
Subject: [PATCH] video: fbdev: fix up for removal of SGI Visual Workstation
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/video/fbdev/Kconfig | 11 +----------
drivers/video/fbdev/Makefile | 1 -
2 files changed, 1 insertion(+), 11 deletions(-)
diff --git a/drivers/video/fbdev/Kconfig b/drivers/video/fbdev/Kconfig
index 31c3f3ddfd38..6b1984c7f4e7 100644
--- a/drivers/video/fbdev/Kconfig
+++ b/drivers/video/fbdev/Kconfig
@@ -765,18 +765,9 @@ config FB_HGA
As this card technology is at least 25 years old,
most people will answer N here.
-config FB_SGIVW
- tristate "SGI Visual Workstation framebuffer support"
- depends on FB && X86_VISWS
- select FB_CFB_FILLRECT
- select FB_CFB_COPYAREA
- select FB_CFB_IMAGEBLIT
- help
- SGI Visual Workstation support for framebuffer graphics.
-
config FB_GBE
bool "SGI Graphics Backend frame buffer support"
- depends on (FB = y) && (SGI_IP32 || X86_VISWS)
+ depends on (FB = y) && SGI_IP32
select FB_CFB_FILLRECT
select FB_CFB_COPYAREA
select FB_CFB_IMAGEBLIT
diff --git a/drivers/video/fbdev/Makefile b/drivers/video/fbdev/Makefile
index 6ef2c66110e3..0284f2a12538 100644
--- a/drivers/video/fbdev/Makefile
+++ b/drivers/video/fbdev/Makefile
@@ -55,7 +55,6 @@ obj-$(CONFIG_FB_CG14) += cg14.o sbuslib.o
obj-$(CONFIG_FB_P9100) += p9100.o sbuslib.o
obj-$(CONFIG_FB_TCX) += tcx.o sbuslib.o
obj-$(CONFIG_FB_LEO) += leo.o sbuslib.o
-obj-$(CONFIG_FB_SGIVW) += sgivwfb.o
obj-$(CONFIG_FB_ACORN) += acornfb.o
obj-$(CONFIG_FB_ATARI) += atafb.o c2p_iplan2.o atafb_mfb.o \
atafb_iplan2p2.o atafb_iplan2p4.o atafb_iplan2p8.o
--
1.9.0
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [GIT PULL] fbdev reorder for 3.15
2014-04-09 19:23 ` Linus Torvalds
2014-04-09 23:04 ` Stephen Rothwell
@ 2014-04-10 5:50 ` Tomi Valkeinen
1 sibling, 0 replies; 4+ messages in thread
From: Tomi Valkeinen @ 2014-04-10 5:50 UTC (permalink / raw)
To: Linus Torvalds, Stephen Rothwell
Cc: linux-kernel, linux-fbdev, Jean-Christophe PLAGNIOL-VILLARD
[-- Attachment #1: Type: text/plain, Size: 511 bytes --]
On 09/04/14 22:23, Linus Torvalds wrote:
> Are there other things pending in this area? Because if there are, I
> think I'll take you up on your "or we can rebase on top of -rc1" offer
> instead.
Nothing from me, and as Stephen said, linux-next doesn't contain
anything either. So I think we're pretty safe here, but maybe you can
wait until you're ready to tag the -rc1, and merge this only then. If
something conflicting has popped up, I can then do a rebase on top of
-rc1 instead.
Tomi
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2014-04-10 5:50 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-04-09 10:48 [GIT PULL] fbdev reorder for 3.15 Tomi Valkeinen
2014-04-09 19:23 ` Linus Torvalds
2014-04-09 23:04 ` Stephen Rothwell
2014-04-10 5:50 ` Tomi Valkeinen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).