| commit | 695a5f339a898b6512a1677eafeb0418caba48a6 | [log] [tgz] |
|---|---|---|
| author | Wolfgang Denk <wd@denx.de> | Tue Dec 09 22:30:11 2008 +0100 |
| committer | Wolfgang Denk <wd@denx.de> | Tue Dec 09 22:30:11 2008 +0100 |
| tree | 9344767986a6dea39d8f1bde5f3f8cbf894154d4 | |
| parent | ee2e9ba917a62cc2e3a484bb79c8da0e01cb93ed [diff] | |
| parent | d2776827315c3d469b8cb4cec14d58877798daa2 [diff] |
Merge branch 'master' of git://git.denx.de/u-boot-usb
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>