diff options
Diffstat (limited to 'drivers/video/logo')
-rw-r--r-- | drivers/video/logo/logo.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/video/logo/logo.c b/drivers/video/logo/logo.c index 2b0f799aa8da..a9283bae7790 100644 --- a/drivers/video/logo/logo.c +++ b/drivers/video/logo/logo.c | |||
@@ -34,6 +34,10 @@ extern const struct linux_logo logo_superh_vga16; | |||
34 | extern const struct linux_logo logo_superh_clut224; | 34 | extern const struct linux_logo logo_superh_clut224; |
35 | extern const struct linux_logo logo_m32r_clut224; | 35 | extern const struct linux_logo logo_m32r_clut224; |
36 | 36 | ||
37 | static int nologo; | ||
38 | module_param(nologo, bool, 0); | ||
39 | MODULE_PARM_DESC(nologo, "Disables startup logo"); | ||
40 | |||
37 | /* logo's are marked __initdata. Use __init_refok to tell | 41 | /* logo's are marked __initdata. Use __init_refok to tell |
38 | * modpost that it is intended that this function uses data | 42 | * modpost that it is intended that this function uses data |
39 | * marked __initdata. | 43 | * marked __initdata. |
@@ -42,6 +46,9 @@ const struct linux_logo * __init_refok fb_find_logo(int depth) | |||
42 | { | 46 | { |
43 | const struct linux_logo *logo = NULL; | 47 | const struct linux_logo *logo = NULL; |
44 | 48 | ||
49 | if (nologo) | ||
50 | return NULL; | ||
51 | |||
45 | if (depth >= 1) { | 52 | if (depth >= 1) { |
46 | #ifdef CONFIG_LOGO_LINUX_MONO | 53 | #ifdef CONFIG_LOGO_LINUX_MONO |
47 | /* Generic Linux logo */ | 54 | /* Generic Linux logo */ |