Merge branch 'master' of git://git.denx.de/u-boot-video

[people/ms/u-boot.git] / include / splash.h

diff --git a/include/splash.h b/include/splash.h
index a60e89542343532b2356d86f0215f30d53e228c6..7ae7a686888c8e94b4051e38789ee3b48adce098 100644 (file)
--- a/include/splash.h
+++ b/include/splash.h
@@ -22,6 +22,8 @@
 #ifndef _SPLASH_H_
 #define _SPLASH_H_
 
+#include <errno.h>
+
 enum splash_storage {
        SPLASH_STORAGE_NAND,
        SPLASH_STORAGE_SF,
@@ -42,6 +44,15 @@ void splash_get_pos(int *x, int *y);
 static inline void splash_get_pos(int *x, int *y) { }
 #endif
 
+#if defined(CONFIG_SPLASH_SCREEN) && defined(CONFIG_LCD)
+int lcd_splash(ulong addr);
+#else
+static inline int lcd_splash(ulong addr)
+{
+       return -ENOSYS;
+}
+#endif
+
 #define BMP_ALIGN_CENTER       0x7FFF
 
 #endif