msm: msm_fb: Remove dead code

This code is no longer used now that mach-msm has been removed.
Delete it.

Cc: Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>
Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>
Cc: David Brown <davidb@codeaurora.org>
Cc: Bryan Huntsman <bryanh@codeaurora.org>
Cc: Daniel Walker <dwalker@fifo99.com>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>

diff --git a/drivers/video/fbdev/Kconfig b/drivers/video/fbdev/Kconfig
index 54fb8f8..2d98de5 100644 (file)
--- a/drivers/video/fbdev/Kconfig
+++ b/drivers/video/fbdev/Kconfig
@@ -2326,13 +2326,6 @@ config FB_PRE_INIT_FB
          Select this option if display contents should be inherited as set by
          the bootloader.
 
-config FB_MSM
-       tristate "MSM Framebuffer support"
-       depends on FB && ARCH_MSM
-       select FB_CFB_FILLRECT
-       select FB_CFB_COPYAREA
-       select FB_CFB_IMAGEBLIT
-
 config FB_MX3
        tristate "MX3 Framebuffer support"
        depends on FB && MX3_IPU

diff --git a/drivers/video/fbdev/Makefile b/drivers/video/fbdev/Makefile
index 1979aff..cecea50 100644 (file)
--- a/drivers/video/fbdev/Makefile
+++ b/drivers/video/fbdev/Makefile
@@ -126,7 +126,6 @@ obj-y                             += omap2/
 obj-$(CONFIG_XEN_FBDEV_FRONTEND)  += xen-fbfront.o
 obj-$(CONFIG_FB_CARMINE)          += carminefb.o
 obj-$(CONFIG_FB_MB862XX)         += mb862xx/
-obj-$(CONFIG_FB_MSM)              += msm/
 obj-$(CONFIG_FB_NUC900)           += nuc900fb.o
 obj-$(CONFIG_FB_JZ4740)                  += jz4740_fb.o
 obj-$(CONFIG_FB_PUV3_UNIGFX)      += fb-puv3.o

diff --cc drivers/video/fbdev/msm/Makefile
Simple merge

diff --cc drivers/video/fbdev/msm/mddi.c
Simple merge

diff --cc drivers/video/fbdev/msm/mddi_client_dummy.c
Simple merge

diff --cc drivers/video/fbdev/msm/mddi_client_nt35399.c
Simple merge

diff --cc drivers/video/fbdev/msm/mddi_client_toshiba.c
Simple merge

diff --cc drivers/video/fbdev/msm/mddi_hw.h
Simple merge

diff --cc drivers/video/fbdev/msm/mdp.c
Simple merge

diff --cc drivers/video/fbdev/msm/mdp_csc_table.h
Simple merge

diff --cc drivers/video/fbdev/msm/mdp_hw.h
Simple merge

diff --cc drivers/video/fbdev/msm/mdp_ppp.c
Simple merge

diff --cc drivers/video/fbdev/msm/mdp_scale_tables.c
Simple merge

diff --cc drivers/video/fbdev/msm/mdp_scale_tables.h
Simple merge

diff --cc drivers/video/fbdev/msm/msm_fb.c
Simple merge

diff --cc include/linux/platform_data/video-msm_fb.h
Simple merge