summaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>2014-03-13 17:43:35 +0100
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2014-03-13 17:43:35 +0100
commit08798026f24bd7c706e70372f8c323f0702c9a15 (patch)
treef8bf5d1866393c82a96dc062814274076482a0e3 /include/linux
parentaadf3192f83a55dbbdb0d395ee5af88b6560edcb (diff)
parent81a1d6173cd255c5c04c332ed69498c6e173515f (diff)
downloadtalos-obmc-uboot-08798026f24bd7c706e70372f8c323f0702c9a15.tar.gz
talos-obmc-uboot-08798026f24bd7c706e70372f8c323f0702c9a15.zip
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/fb.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/fb.h b/include/linux/fb.h
index 111372c9fd..652cf3bab7 100644
--- 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 */
OpenPOWER on IntegriCloud