| Message ID | 20231122131154.2444690-9-trini@konsulko.com |
|---|---|
| State | Superseded |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | [01/11] global: Remove duplicate common.h inclusions | expand |
On Wed, 22 Nov 2023 at 06:14, Tom Rini <trini@konsulko.com> wrote: > > In include/display_options.h we cannot include ourself, but do need > <linux/types.h> directly. Then in lib/display_options.c we further clean > the list to remove common.h. > > Signed-off-by: Tom Rini <trini@konsulko.com> > --- > include/display_options.h | 3 ++- > lib/display_options.c | 3 ++- > 2 files changed, 4 insertions(+), 2 deletions(-) Reviewed-by: Simon Glass <sjg@chromium.org>
diff --git a/include/display_options.h b/include/display_options.h index 85dacbc75902..66e596077370 100644 --- a/include/display_options.h +++ b/include/display_options.h @@ -9,6 +9,8 @@ #ifndef __DISPLAY_OPTIONS_H #define __DISPLAY_OPTIONS_H +#include <linux/types.h> + /** * print_size() - Print a size with a suffix * @@ -19,7 +21,6 @@ * @size: Size to print * @suffix String to print after the size */ -#include <display_options.h> void print_size(uint64_t size, const char *suffix); /** diff --git a/lib/display_options.c b/lib/display_options.c index 80def5201f96..d6b93553dcb5 100644 --- a/lib/display_options.c +++ b/lib/display_options.c @@ -4,14 +4,15 @@ * Wolfgang Denk, DENX Software Engineering, wd@denx.de. */ -#include <common.h> #include <compiler.h> #include <console.h> #include <display_options.h> #include <div64.h> #include <version_string.h> #include <linux/ctype.h> +#include <linux/kernel.h> #include <asm/io.h> +#include <vsprintf.h> char *display_options_get_banner_priv(bool newlines, const char *build_tag, char *buf, int size)
In include/display_options.h we cannot include ourself, but do need <linux/types.h> directly. Then in lib/display_options.c we further clean the list to remove common.h. Signed-off-by: Tom Rini <trini@konsulko.com> --- include/display_options.h | 3 ++- lib/display_options.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-)