arm: remove duplicated include

Message ID 202312151426+0800-wangjinchao@xfusion.com
State New
Headers
Series arm: remove duplicated include |

Commit Message

Wang Jinchao Dec. 15, 2023, 6:27 a.m. UTC
  remove duplicated include

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

Comments

Russell King (Oracle) Dec. 15, 2023, 10:32 a.m. UTC | #1
On Fri, Dec 15, 2023 at 02:27:23PM +0800, Wang Jinchao wrote:
> remove duplicated include
> 
> Signed-off-by: Wang Jinchao <wangjinchao@xfusion.com>
> ---

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.
  

Patch

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)
 {