Merge branch 'master' of git://git.denx.de/u-boot-nand-flash

[karo-tx-uboot.git] / 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..191093bf1ecf59464a96b96b17c9786059600ab3 100644 (file)
--- a/arch/arm/include/asm/arch-mxs/regs-pinctrl.h
+++ b/arch/arm/include/asm/arch-mxs/regs-pinctrl.h
@@ -26,10 +26,10 @@
 #ifndef __MX28_REGS_PINCTRL_H__
 #define __MX28_REGS_PINCTRL_H__
 
-#include <asm/arch/regs-common.h>
+#include <asm/imx-common/regs-common.h>
 
 #ifndef        __ASSEMBLY__
-struct mx28_pinctrl_regs {
+struct mxs_pinctrl_regs {
        mxs_reg_32(hw_pinctrl_ctrl)             /* 0x0 */
 
        uint32_t        reserved1[60];