aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/Makefile
diff options
context:
space:
mode:
authorTomi Valkeinen <tomi.valkeinen@ti.com>2012-11-05 08:14:17 -0500
committerTony Lindgren <tony@atomide.com>2012-11-07 16:26:27 -0500
commit0191bf368fd95ecd4f83e62b0ad6de12048b14bf (patch)
treeabd962268d5e58ef6c016474cb80c3f58fe4ea9e /arch/arm/mach-omap2/Makefile
parentcc0677979e3ef1ae25ea9db4edc63786a3731526 (diff)
OMAP: panda: move display init from board file to dss-common.c
Device tree support for omapdss is still some way in the future. In an effort to get a minimal DSS support for DT enabled kernel on selected OMAP4 boards, we'll go for a temporary solution: We will call the same non-DT omapdss setup code for OMAP4 SDP and Pandaboards from board-generic.c, thus enabling DSS for those boards. This patch moves the display setup code from board-omap4panda.c to dss-common.c. dss-common.c will be called by the board-omap4panda.c when running on non-DT kernel, and by board-generic.c when running on DT enabled kernel. Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2/Makefile')
-rw-r--r--arch/arm/mach-omap2/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile
index fe40d9e488c9..fb38a9b24b0c 100644
--- a/arch/arm/mach-omap2/Makefile
+++ b/arch/arm/mach-omap2/Makefile
@@ -279,4 +279,4 @@ endif
279emac-$(CONFIG_TI_DAVINCI_EMAC) := am35xx-emac.o 279emac-$(CONFIG_TI_DAVINCI_EMAC) := am35xx-emac.o
280obj-y += $(emac-m) $(emac-y) 280obj-y += $(emac-m) $(emac-y)
281 281
282obj-y += common-board-devices.o twl-common.o 282obj-y += common-board-devices.o twl-common.o dss-common.o