diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-01-09 15:57:03 (GMT) |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-01-09 15:57:03 (GMT) |
| commit | ea33fb1a32e8e3f408b311823cabbb7453148f80 (patch) | |
| tree | a81f26a32a32e33c2a25a82423d0bcc8ad48973a /arch/arm/cpu | |
| parent | 61bdb9133593f0f881a57232039296f64bd662ed (diff) | |
| parent | bfbfab94fd0b38ca780e6dda99657b0c848c9bb9 (diff) | |
| download | u-boot-fsl-qoriq-ea33fb1a32e8e3f408b311823cabbb7453148f80.tar.xz | |
Merge branch 'u-boot-marvell/master' into 'u-boot-arm/master'
Diffstat (limited to 'arch/arm/cpu')
| -rw-r--r-- | arch/arm/cpu/arm926ejs/kirkwood/mpp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/cpu/arm926ejs/kirkwood/mpp.c b/arch/arm/cpu/arm926ejs/kirkwood/mpp.c index 03eb2de..0ba6f09 100644 --- a/arch/arm/cpu/arm926ejs/kirkwood/mpp.c +++ b/arch/arm/cpu/arm926ejs/kirkwood/mpp.c @@ -31,7 +31,7 @@ static u32 kirkwood_variant(void) #define MPP_CTRL(i) (KW_MPP_BASE + (i* 4)) #define MPP_NR_REGS (1 + MPP_MAX/8) -void kirkwood_mpp_conf(u32 *mpp_list, u32 *mpp_save) +void kirkwood_mpp_conf(const u32 *mpp_list, u32 *mpp_save) { u32 mpp_ctrl[MPP_NR_REGS]; unsigned int variant_mask; |