Merge branch 'work/old-omapfb-removal'

2026-11-13 07:31:07 +00:00 · 2012-02-23 09:45:58 +02:00 · 2012-02-23 09:45:58 +02:00 · 973b659cbf
commit 973b659cbf
parent f15511e23d ae7e1f2d0b
35 changed files with 100 additions and 4632 deletions
--- a/arch/arm/mach-omap1/board-ams-delta.c
+++ b/arch/arm/mach-omap1/board-ams-delta.c
--- a/arch/arm/mach-omap1/board-fsample.c
+++ b/arch/arm/mach-omap1/board-fsample.c
--- a/arch/arm/mach-omap1/board-h2.c
+++ b/arch/arm/mach-omap1/board-h2.c
--- a/arch/arm/mach-omap1/board-h3.c
+++ b/arch/arm/mach-omap1/board-h3.c
--- a/arch/arm/mach-omap1/board-htcherald.c
+++ b/arch/arm/mach-omap1/board-htcherald.c
--- a/arch/arm/mach-omap1/board-innovator.c
+++ b/arch/arm/mach-omap1/board-innovator.c
--- a/arch/arm/mach-omap1/board-nokia770.c
+++ b/arch/arm/mach-omap1/board-nokia770.c
--- a/arch/arm/mach-omap1/board-osk.c
+++ b/arch/arm/mach-omap1/board-osk.c
--- a/arch/arm/mach-omap1/board-palmte.c
+++ b/arch/arm/mach-omap1/board-palmte.c
--- a/arch/arm/mach-omap1/board-palmtt.c
+++ b/arch/arm/mach-omap1/board-palmtt.c
--- a/arch/arm/mach-omap1/board-palmz71.c
+++ b/arch/arm/mach-omap1/board-palmz71.c
--- a/arch/arm/mach-omap1/board-perseus2.c
+++ b/arch/arm/mach-omap1/board-perseus2.c
--- a/arch/arm/mach-omap1/board-sx1.c
+++ b/arch/arm/mach-omap1/board-sx1.c
--- a/arch/arm/mach-omap2/io.c
+++ b/arch/arm/mach-omap2/io.c
--- a/arch/arm/plat-omap/common.c
+++ b/arch/arm/plat-omap/common.c
--- a/arch/arm/plat-omap/fb.c
+++ b/arch/arm/plat-omap/fb.c
--- a/arch/arm/plat-omap/fb.h
+++ b/arch/arm/plat-omap/fb.h
--- a/arch/arm/plat-omap/include/plat/blizzard.h
+++ b/arch/arm/plat-omap/include/plat/blizzard.h
--- a/arch/arm/plat-omap/include/plat/board.h
+++ b/arch/arm/plat-omap/include/plat/board.h
--- a/arch/arm/plat-omap/include/plat/hwa742.h
+++ b/arch/arm/plat-omap/include/plat/hwa742.h
--- a/arch/arm/plat-omap/include/plat/vram.h
+++ b/arch/arm/plat-omap/include/plat/vram.h
--- a/drivers/video/omap/Kconfig
+++ b/drivers/video/omap/Kconfig
--- a/drivers/video/omap/Makefile
+++ b/drivers/video/omap/Makefile
--- a/drivers/video/omap/blizzard.c
+++ b/drivers/video/omap/blizzard.c
--- a/drivers/video/omap/dispc.c
+++ b/drivers/video/omap/dispc.c
--- a/drivers/video/omap/dispc.h
+++ b/drivers/video/omap/dispc.h
--- a/drivers/video/omap/hwa742.c
+++ b/drivers/video/omap/hwa742.c
--- a/drivers/video/omap/omapfb.h
+++ b/drivers/video/omap/omapfb.h
--- a/drivers/video/omap/omapfb_main.c
+++ b/drivers/video/omap/omapfb_main.c
--- a/drivers/video/omap/rfbi.c
+++ b/drivers/video/omap/rfbi.c
--- a/drivers/video/omap2/dss/dispc.c
+++ b/drivers/video/omap2/dss/dispc.c
--- a/drivers/video/omap2/omapfb/omapfb-ioctl.c
+++ b/drivers/video/omap2/omapfb/omapfb-ioctl.c
--- a/drivers/video/omap2/omapfb/omapfb-main.c
+++ b/drivers/video/omap2/omapfb/omapfb-main.c
--- a/drivers/video/omap2/vram.c
+++ b/drivers/video/omap2/vram.c
--- a/include/linux/omapfb.h
+++ b/include/linux/omapfb.h