On Tue, 5 Apr 2022 11:17:42 +0200 Arnd Bergmann wrote: > From: Arnd Bergmann > > Nothing relies on it outside of arch/arm/mach-ep93xx/, so just move > it there. > > Cc: Hartley Sweeten > Tested-by: Alexander Sverdlin > Signed-off-by: Arnd Bergmann > --- > arch/arm/mach-ep93xx/{include/mach => }/ep93xx-regs.h | 4 ---- > arch/arm/mach-ep93xx/gpio-ep93xx.h | 2 +- > arch/arm/mach-ep93xx/include/mach/uncompress.h | 1 - > arch/arm/mach-ep93xx/soc.h | 2 +- > 4 files changed, 2 insertions(+), 7 deletions(-) > rename arch/arm/mach-ep93xx/{include/mach => }/ep93xx-regs.h (94%) > > diff --git a/arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h > b/arch/arm/mach-ep93xx/ep93xx-regs.h similarity index 94% > rename from arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h > rename to arch/arm/mach-ep93xx/ep93xx-regs.h > index 6839ea032e58..8fa3646de0a4 100644 > --- a/arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h > +++ b/arch/arm/mach-ep93xx/ep93xx-regs.h > @@ -1,8 +1,4 @@ > /* SPDX-License-Identifier: GPL-2.0 */ > -/* > - * arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h > - */ > - > #ifndef __ASM_ARCH_EP93XX_REGS_H > #define __ASM_ARCH_EP93XX_REGS_H > > diff --git a/arch/arm/mach-ep93xx/gpio-ep93xx.h > b/arch/arm/mach-ep93xx/gpio-ep93xx.h index 242af4a401ea..7b46eb7e5507 > 100644 --- a/arch/arm/mach-ep93xx/gpio-ep93xx.h > +++ b/arch/arm/mach-ep93xx/gpio-ep93xx.h > @@ -4,7 +4,7 @@ > #ifndef __GPIO_EP93XX_H > #define __GPIO_EP93XX_H > > -#include > +#include "ep93xx-regs.h" > > #define EP93XX_GPIO_PHYS_BASE > EP93XX_APB_PHYS(0x00040000) #define EP93XX_GPIO_BASE > EP93XX_APB_IOMEM(0x00040000) diff --git > a/arch/arm/mach-ep93xx/include/mach/uncompress.h > b/arch/arm/mach-ep93xx/include/mach/uncompress.h index > b3ec1db988db..e20bcab702b2 100644 --- > a/arch/arm/mach-ep93xx/include/mach/uncompress.h +++ > b/arch/arm/mach-ep93xx/include/mach/uncompress.h @@ -5,7 +5,6 @@ > * Copyright (C) 2006 Lennert Buytenhek > */ > > -#include > #include > > static unsigned char __raw_readb(unsigned int ptr) > diff --git a/arch/arm/mach-ep93xx/soc.h b/arch/arm/mach-ep93xx/soc.h > index f0986e288d19..3245ebbd5069 100644 > --- a/arch/arm/mach-ep93xx/soc.h > +++ b/arch/arm/mach-ep93xx/soc.h > @@ -9,7 +9,7 @@ > #ifndef _EP93XX_SOC_H > #define _EP93XX_SOC_H > > -#include > +#include "ep93xx-regs.h" > #include "irqs.h" > > /* Reviewed-by: Lukasz Majewski Best regards, Lukasz Majewski -- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-59 Fax: (+49)-8142-66989-80 Email: lukma@denx.de