Patchwork [U-Boot,v4,1/3] ARM: MX31: Fix file name label

login
register
mail settings
Submitter Fabio Estevam
Date April 16, 2011, 2:54 a.m.
Message ID <1302922492-25505-1-git-send-email-festevam@gmail.com>
Download mbox | patch
Permalink /patch/91470/
State Accepted
Delegated to: Stefano Babic
Headers show

Comments

Fabio Estevam - April 16, 2011, 2:54 a.m.
Commit 5d2c154 (IMX: MX31: Cleanup include files and drop nasty #ifdef in drivers)
renamed mx31-imx-regs.h to imx-regs.h.

Change the file label accordingly.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
This patch series should were applied in the u-boot-arm tree.
It also needs the following patch to be applied first:
[PATCH v5] ARM: mx31: Print the silicon version

 arch/arm/include/asm/arch-mx31/imx-regs.h |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
Albert ARIBAUD - April 16, 2011, 3:28 a.m.
Hi Fabio,

Le 16/04/2011 04:54, Fabio Estevam a écrit :
> Commit 5d2c154 (IMX: MX31: Cleanup include files and drop nasty #ifdef in drivers)
> renamed mx31-imx-regs.h to imx-regs.h.
>
> Change the file label accordingly.
>
> Signed-off-by: Fabio Estevam<fabio.estevam@freescale.com>
> ---
> This patch series should were applied in the u-boot-arm tree.
> It also needs the following patch to be applied first:
> [PATCH v5] ARM: mx31: Print the silicon version
>
>   arch/arm/include/asm/arch-mx31/imx-regs.h |    6 +++---
>   1 files changed, 3 insertions(+), 3 deletions(-)

Please provide changelog of patch versions below commit message 
separator ('---') for each patch.

Amicalement,
Albert ARIBAUD - April 16, 2011, 3:31 a.m.
Le 16/04/2011 04:54, Fabio Estevam a écrit :
> Commit 5d2c154 (IMX: MX31: Cleanup include files and drop nasty #ifdef in drivers)
> renamed mx31-imx-regs.h to imx-regs.h.
>
> Change the file label accordingly.
>
> Signed-off-by: Fabio Estevam<fabio.estevam@freescale.com>
> ---
> This patch series should were applied in the u-boot-arm tree.
> It also needs the following patch to be applied first:
> [PATCH v5] ARM: mx31: Print the silicon version

So the dependency is on the IMX tree rather than ARM tree: this patch 
series should rather be applied on top of u-boot-imx, then I'll pull it 
in with all of the IMX changes for this version.

Amicalement,
Stefano Babic - April 21, 2011, 5:43 p.m.
On 04/16/2011 04:54 AM, Fabio Estevam wrote:
> Commit 5d2c154 (IMX: MX31: Cleanup include files and drop nasty #ifdef in drivers)
> renamed mx31-imx-regs.h to imx-regs.h.
> 
> Change the file label accordingly.
> 
> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
> ---

Applied to u-boot-imx, thanks.

Regards,
Stefano Babic

Patch

diff --git a/arch/arm/include/asm/arch-mx31/imx-regs.h b/arch/arm/include/asm/arch-mx31/imx-regs.h
index 0eeaf39..74444f2 100644
--- a/arch/arm/include/asm/arch-mx31/imx-regs.h
+++ b/arch/arm/include/asm/arch-mx31/imx-regs.h
@@ -21,8 +21,8 @@ 
  * MA 02111-1307 USA
  */
 
-#ifndef __ASM_ARCH_MX31_REGS_H
-#define __ASM_ARCH_MX31_REGS_H
+#ifndef __ASM_ARCH_MX31_IMX_REGS_H
+#define __ASM_ARCH_MX31_IMX_REGS_H
 
 #if !(defined(__KERNEL_STRICT_NAMES) || defined(__ASSEMBLY__))
 #include <asm/types.h>
@@ -774,4 +774,4 @@  enum iomux_pins {
 #define MXC_EHCI_IPPUE_DOWN		(1 << 8)
 #define MXC_EHCI_IPPUE_UP		(1 << 9)
 
-#endif /* __ASM_ARCH_MX31_REGS_H */
+#endif /* __ASM_ARCH_MX31_IMX_REGS_H */