Merge branch 'master' of /home/wd/git/u-boot/custodians

2008-12-09 21:16:38 +01:00 · 2008-12-09 21:16:38 +01:00 · d5e710a397
parent 4c253fdb2a ee2e9ba917
commit d5e710a397
1 changed files with 0 additions and 2 deletions
--- 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>