summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2008-12-09 21:16:38 +0100
committerWolfgang Denk <wd@denx.de>2008-12-09 21:16:38 +0100
commitd5e710a3974e0e9bbac5bf15d815b0ead1bec8a8 (patch)
treeac6165884cd4551f31d4f59a624ffb2cf3b8e2c1
parent4c253fdb2a175ea3472c38a1455a16faa58e81f0 (diff)
parentee2e9ba917a62cc2e3a484bb79c8da0e01cb93ed (diff)
downloadu-boot-imx-d5e710a3974e0e9bbac5bf15d815b0ead1bec8a8.zip
u-boot-imx-d5e710a3974e0e9bbac5bf15d815b0ead1bec8a8.tar.gz
u-boot-imx-d5e710a3974e0e9bbac5bf15d815b0ead1bec8a8.tar.bz2
Merge branch 'master' of /home/wd/git/u-boot/custodians
-rw-r--r--cpu/mpc8xx/video.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/cpu/mpc8xx/video.c b/cpu/mpc8xx/video.c
index 5479644..4a59927 100644
--- a/cpu/mpc8xx/video.c
+++ b/cpu/mpc8xx/video.c
@@ -32,10 +32,8 @@
#include <stdarg.h>
#include <common.h>
#include <config.h>
-#ifdef VIDEO_INFO
#include <version.h>
#include <timestamp.h>
-#endif
#include <i2c.h>
#include <linux/types.h>
#include <devices.h>