2023-12-15 06:44:44

by Wang Jinchao

Subject: [PATCH] arm: remove duplicated include

remove duplicated include

Signed-off-by: Wang Jinchao <[email protected]>
---
arch/arm/include/asm/pgtable.h | 4 ++--
arch/arm/mach-footbridge/common.c | 1 -
2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/arch/arm/include/asm/pgtable.h b/arch/arm/include/asm/pgtable.h
index 16b02f44c7d3..8c0de013f85e 100644
--- a/arch/arm/include/asm/pgtable.h
+++ b/arch/arm/include/asm/pgtable.h
@@ -19,14 +19,14 @@ extern struct page *empty_zero_page;
#define ZERO_PAGE(vaddr) (empty_zero_page)
#endif

+#include <asm-generic/pgtable-nopud.h>
+
#ifndef CONFIG_MMU

-#include <asm-generic/pgtable-nopud.h>
#include <asm/pgtable-nommu.h>

#else

-#include <asm-generic/pgtable-nopud.h>
#include <asm/page.h>
#include <asm/pgtable-hwdef.h>

diff --git a/arch/arm/mach-footbridge/common.c b/arch/arm/mach-footbridge/common.c
index 85c598708c10..c8f52d52b91b 100644
--- a/arch/arm/mach-footbridge/common.c
+++ b/arch/arm/mach-footbridge/common.c
@@ -30,7 +30,6 @@

#include <mach/hardware.h>
#include <mach/irqs.h>
-#include <asm/hardware/dec21285.h>

static int dc21285_get_irq(void)
{
--
2.40.0

2023-12-15 10:33:35

by Russell King (Oracle)

Subject: Re: [PATCH] arm: remove duplicated include

On Fri, Dec 15, 2023 at 02:27:23PM +0800, Wang Jinchao wrote:
> remove duplicated include
>
> Signed-off-by: Wang Jinchao <[email protected]>
> ---

These have been ignored in the past because although they seem correct,
they haven't ended up in my patch system. I guess I'm going to get asked
what that is, despite the link to it being in the footer of every email
I send... (please look at the footer of this email and follow the link!)

Thanks.

--
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/
FTTP is here! 80Mbps down 10Mbps up. Decent connectivity at last!