merged tx6dl-devel into denx master branch

[karo-tx-uboot.git] / arch / arm / imx-common / cpu.c

diff --git a/arch/arm/imx-common/cpu.c b/arch/arm/imx-common/cpu.c
index 0cd2538b21818de2cb625c0579cf2feed048a8bc..c847a838f003e65be8c2d9128de5199a1a253f1a 100644 (file)
--- a/arch/arm/imx-common/cpu.c
+++ b/arch/arm/imx-common/cpu.c
@@ -14,7 +14,6 @@
 #include <asm/arch/clock.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/crm_regs.h>
-#include <ipu_pixfmt.h>
 
 #ifdef CONFIG_FSL_ESDHC
 #include <fsl_esdhc.h>
@@ -170,11 +169,3 @@ u32 get_ahb_clk(void)
 
        return get_periph_clk() / (ahb_podf + 1);
 }
-
-#if defined(CONFIG_VIDEO_IPUV3)
-void arch_preboot_os(void)
-{
-       /* disable video before launching O/S */
-       ipuv3_fb_shutdown();
-}
-#endif