diff options
| author | Stefano Babic | 2014-08-08 10:18:40 +0200 |
|---|---|---|
| committer | Stefano Babic | 2014-08-08 10:18:40 +0200 |
| commit | c23154aab5825fec81d5500c53eaa686646c76b5 (patch) | |
| tree | 32b0aafae49f664a65ced50981492bb031f006b8 /arch/arm/cpu/armv7/keystone/msmc.c | |
| parent | cb07d74e2e0c0a41533b6bcd551af9bf2ebcf2bc (diff) | |
| parent | 9d195a546179bc732aba9eacccf0a9a3db591288 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'arch/arm/cpu/armv7/keystone/msmc.c')
| -rw-r--r-- | arch/arm/cpu/armv7/keystone/msmc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/cpu/armv7/keystone/msmc.c b/arch/arm/cpu/armv7/keystone/msmc.c index f3f1621d205..7d8e5978dfa 100644 --- a/arch/arm/cpu/armv7/keystone/msmc.c +++ b/arch/arm/cpu/armv7/keystone/msmc.c @@ -8,7 +8,7 @@ */ #include <common.h> -#include <asm/arch/hardware.h> +#include <asm/arch/msmc.h> struct mpax { u32 mpaxl; @@ -56,9 +56,9 @@ struct msms_regs { }; -void share_all_segments(int priv_id) +void msmc_share_all_segments(int priv_id) { - struct msms_regs *msmc = (struct msms_regs *)K2HK_MSMC_CTRL_BASE; + struct msms_regs *msmc = (struct msms_regs *)KS2_MSMC_CTRL_BASE; int j; for (j = 0; j < 8; j++) { |