Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'

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

diff --git a/arch/arm/include/asm/arch-mxs/regs-gpmi.h b/arch/arm/include/asm/arch-mxs/regs-gpmi.h
index 190a570b5a1507c14f82072cbd4e1254dbedd706..624d6185603777281f29bb18ca13ac3a8e88c988 100644 (file)
--- a/arch/arm/include/asm/arch-mxs/regs-gpmi.h
+++ b/arch/arm/include/asm/arch-mxs/regs-gpmi.h
@@ -29,7 +29,7 @@
 #include <asm/arch/regs-common.h>
 
 #ifndef        __ASSEMBLY__
-struct mx28_gpmi_regs {
+struct mxs_gpmi_regs {
        mxs_reg_32(hw_gpmi_ctrl0)
        mxs_reg_32(hw_gpmi_compare)
        mxs_reg_32(hw_gpmi_eccctrl)