Merge samsung, imx, tegra into u-boot-arm/master

[u-boot] / arch / arm / include / asm / arch-mxs / regs-pinctrl.h

diff --git a/arch/arm/include/asm/arch-mxs/regs-pinctrl.h b/arch/arm/include/asm/arch-mxs/regs-pinctrl.h
index ca1d7916c1983e03c7049ca4229dc293538d5526..d5841709c4a3c12e4650acb7282be24260365781 100644 (file)
--- a/arch/arm/include/asm/arch-mxs/regs-pinctrl.h
+++ b/arch/arm/include/asm/arch-mxs/regs-pinctrl.h
@@ -29,7 +29,7 @@
 #include <asm/arch/regs-common.h>
 
 #ifndef        __ASSEMBLY__
-struct mx28_pinctrl_regs {
+struct mxs_pinctrl_regs {
        mxs_reg_32(hw_pinctrl_ctrl)             /* 0x0 */
 
        uint32_t        reserved1[60];