Merge branch 'master' of git://git.denx.de/u-boot-usb

diff --git a/cpu/mpc8xx/video.c b/cpu/mpc8xx/video.c
index 54796449c4bb4a64e630df255d5cf1e19ec3a9a9..4a59927436c34ce372aba8bac3e6dd67c91fa128 100644 (file)
--- 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>