2012-02-15 17:55:35

by Danny Kukawka

Subject: [PATCH] of/fdt.c: asm/setup.h included twice

drivers/of/fdt.c included 'asm/setup.h' twice, remove the duplicate.

Signed-off-by: Danny Kukawka <[email protected]>
---
drivers/of/fdt.c | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
index ea2bd1b..91a375f 100644
--- a/drivers/of/fdt.c
+++ b/drivers/of/fdt.c
@@ -23,7 +23,6 @@
#include <asm/machdep.h>
#endif /* CONFIG_PPC */

-#include <asm/setup.h>
#include <asm/page.h>

char *of_fdt_get_string(struct boot_param_header *blob, u32 offset)
--
1.7.8.3

2012-02-15 19:21:29

by Rob Herring

Subject: Re: [PATCH] of/fdt.c: asm/setup.h included twice

On 02/15/2012 11:55 AM, Danny Kukawka wrote:
> drivers/of/fdt.c included 'asm/setup.h' twice, remove the duplicate.
>
> Signed-off-by: Danny Kukawka <[email protected]>

Applied for 3.4.

Rob

> ---
> drivers/of/fdt.c | 1 -
> 1 files changed, 0 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
> index ea2bd1b..91a375f 100644
> --- a/drivers/of/fdt.c
> +++ b/drivers/of/fdt.c
> @@ -23,7 +23,6 @@
> #include <asm/machdep.h>
> #endif /* CONFIG_PPC */
>
> -#include <asm/setup.h>
> #include <asm/page.h>
>
> char *of_fdt_get_string(struct boot_param_header *blob, u32 offset)