diff options
| author | Steve French <sfrench@us.ibm.com> | 2007-07-18 20:38:57 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2007-07-18 20:38:57 -0400 |
| commit | 1ff8392c32a2645d2665ca779ecb91bb29361c13 (patch) | |
| tree | 860b95e9a499ade4060848740fc6ce1fbb4e4e8d /include/linux/linux_logo.h | |
| parent | 70b315b0dd3879cb3ab8aadffb14f10b2d19b9c3 (diff) | |
| parent | 5bae7ac9feba925fd0099057f6b23d7be80b7b41 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
fs/cifs/export.c
Diffstat (limited to 'include/linux/linux_logo.h')
| -rw-r--r-- | include/linux/linux_logo.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/include/linux/linux_logo.h b/include/linux/linux_logo.h index 9c01bde5bf1b..08a92969c76e 100644 --- a/include/linux/linux_logo.h +++ b/include/linux/linux_logo.h | |||
| @@ -33,5 +33,13 @@ struct linux_logo { | |||
| 33 | }; | 33 | }; |
| 34 | 34 | ||
| 35 | extern const struct linux_logo *fb_find_logo(int depth); | 35 | extern const struct linux_logo *fb_find_logo(int depth); |
| 36 | #ifdef CONFIG_FB_LOGO_EXTRA | ||
| 37 | extern void fb_append_extra_logo(const struct linux_logo *logo, | ||
| 38 | unsigned int n); | ||
| 39 | #else | ||
| 40 | static inline void fb_append_extra_logo(const struct linux_logo *logo, | ||
| 41 | unsigned int n) | ||
| 42 | {} | ||
| 43 | #endif | ||
| 36 | 44 | ||
| 37 | #endif /* _LINUX_LINUX_LOGO_H */ | 45 | #endif /* _LINUX_LINUX_LOGO_H */ |