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

d5e710a3 · Wolfgang Denk · 4c253fdb · ee2e9ba9 · d5e710a3
隐藏空白更改
内联并排

Showing with 0 addition and 2 deletion

cpu/mpc8xx/video.c cpu/mpc8xx/video.c +0 -2

未找到文件。
--- 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>