summaryrefslogtreecommitdiff
path: root/drivers/video
diff options
context:
space:
mode:
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>2013-07-10 20:40:47 +0200
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2013-07-10 20:40:47 +0200
commit630aacb0859c6e26b2b0311d8e245da5e5b8ac67 (patch)
treee9f6f6c28ae4a655f4519ca0db7bc882f8ee9abc /drivers/video
parent87bd05d78f0f5765f3d3e1517c76794c82dab7cc (diff)
parent1ae76d438b602fe8be1f0ef8b8ce47c89d371047 (diff)
downloadu-boot-imx-630aacb0859c6e26b2b0311d8e245da5e5b8ac67.zip
u-boot-imx-630aacb0859c6e26b2b0311d8e245da5e5b8ac67.tar.gz
u-boot-imx-630aacb0859c6e26b2b0311d8e245da5e5b8ac67.tar.bz2
Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master'
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/exynos_fimd.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/video/exynos_fimd.c b/drivers/video/exynos_fimd.c
index 3359949..7243ea3 100644
--- a/drivers/video/exynos_fimd.c
+++ b/drivers/video/exynos_fimd.c
@@ -280,8 +280,9 @@ void exynos_fimd_lcd_init(vidinfo_t *vid)
node, "reg");
if (fimd_ctrl == NULL)
debug("Can't get the FIMD base address\n");
-#endif
+#else
fimd_ctrl = (struct exynos_fb *)samsung_get_base_fimd();
+#endif
offset = exynos_fimd_get_base_offset();