Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'

2014-03-13 17:43:35 +01:00
parent aadf3192f8 81a1d6173c
commit 08798026f2
18 changed files with 2379 additions and 6 deletions
--- a/include/linux/fb.h
+++ b/include/linux/fb.h
@@ -612,6 +612,8 @@ struct fb_videomode {
 	u32 flag;
 };

+int board_video_skip(void);
+
 #endif /* __KERNEL__ */

 #endif /* _LINUX_FB_H */