| Message ID | 1302922492-25505-1-git-send-email-festevam@gmail.com |
|---|---|
| State | Accepted |
| Delegated to: | Stefano Babic |
| Headers | show |
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,
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,
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
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 */
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(-)