Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus

[deliverable/linux.git] / include / linux / linux_logo.h

diff --git a/include/linux/linux_logo.h b/include/linux/linux_logo.h
index 9c01bde5bf1b222fdce04cb32ecc5457680c198b..08a92969c76e09f99ad546ec4f8a84aa8b6ed917 100644 (file)
--- a/include/linux/linux_logo.h
+++ b/include/linux/linux_logo.h
@@ -33,5 +33,13 @@ struct linux_logo {
 };
 
 extern const struct linux_logo *fb_find_logo(int depth);
+#ifdef CONFIG_FB_LOGO_EXTRA
+extern void fb_append_extra_logo(const struct linux_logo *logo,
+                                unsigned int n);
+#else
+static inline void fb_append_extra_logo(const struct linux_logo *logo,
+                                       unsigned int n)
+{}
+#endif
 
 #endif /* _LINUX_LINUX_LOGO_H */