* [PATCH] of/fdt.c: asm/setup.h included twice
@ 2012-02-15 17:55 Danny Kukawka
2012-02-15 19:20 ` Rob Herring
0 siblings, 1 reply; 2+ messages in thread
From: Danny Kukawka @ 2012-02-15 17:55 UTC (permalink / raw)
To: Grant Likely; +Cc: Danny Kukawka, Rob Herring, devicetree-discuss, linux-kernel
drivers/of/fdt.c included 'asm/setup.h' twice, remove the duplicate.
Signed-off-by: Danny Kukawka <danny.kukawka@bisect.de>
---
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] of/fdt.c: asm/setup.h included twice
2012-02-15 17:55 [PATCH] of/fdt.c: asm/setup.h included twice Danny Kukawka
@ 2012-02-15 19:20 ` Rob Herring
0 siblings, 0 replies; 2+ messages in thread
From: Rob Herring @ 2012-02-15 19:20 UTC (permalink / raw)
To: Danny Kukawka
Cc: Grant Likely, Danny Kukawka, devicetree-discuss, linux-kernel
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 <danny.kukawka@bisect.de>
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)
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-02-15 19:21 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-02-15 17:55 [PATCH] of/fdt.c: asm/setup.h included twice Danny Kukawka
2012-02-15 19:20 ` Rob Herring
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).