From mboxrd@z Thu Jan 1 00:00:00 1970 From: nicolas.ferre@atmel.com (Nicolas Ferre) Date: Mon, 23 Mar 2015 11:15:03 +0100 Subject: [PATCH 02/10] ARM: at91/pm: move AT91_MEMCTRL_* to pm.h In-Reply-To: <1426545886-19162-3-git-send-email-alexandre.belloni@free-electrons.com> References: <1426545886-19162-1-git-send-email-alexandre.belloni@free-electrons.com> <1426545886-19162-3-git-send-email-alexandre.belloni@free-electrons.com> Message-ID: <550FE7A7.9050900@atmel.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Le 16/03/2015 23:44, Alexandre Belloni a ?crit : > the AT91_MEMCTRL_* defines are only used by the pm code, move them to pm.h > > Signed-off-by: Alexandre Belloni Acked-by: Nicolas Ferre > --- > arch/arm/mach-at91/include/mach/at91_ramc.h | 4 ---- > arch/arm/mach-at91/pm.h | 4 ++++ > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/arch/arm/mach-at91/include/mach/at91_ramc.h b/arch/arm/mach-at91/include/mach/at91_ramc.h > index e4492b151fee..493bc486e858 100644 > --- a/arch/arm/mach-at91/include/mach/at91_ramc.h > +++ b/arch/arm/mach-at91/include/mach/at91_ramc.h > @@ -21,10 +21,6 @@ extern void __iomem *at91_ramc_base[]; > .extern at91_ramc_base > #endif > > -#define AT91_MEMCTRL_MC 0 > -#define AT91_MEMCTRL_SDRAMC 1 > -#define AT91_MEMCTRL_DDRSDR 2 > - > #include > #include > #include > diff --git a/arch/arm/mach-at91/pm.h b/arch/arm/mach-at91/pm.h > index 3223967d3460..ecd875a91d52 100644 > --- a/arch/arm/mach-at91/pm.h > +++ b/arch/arm/mach-at91/pm.h > @@ -15,6 +15,10 @@ > > #include > > +#define AT91_MEMCTRL_MC 0 > +#define AT91_MEMCTRL_SDRAMC 1 > +#define AT91_MEMCTRL_DDRSDR 2 > + > #define AT91_PM_MEMTYPE_MASK 0x0f > > #define AT91_PM_MODE_OFFSET 4 > -- Nicolas Ferre