diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2012-10-27 11:43:17 +0200 | 
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2012-10-27 11:43:17 +0200 | 
| commit | f04821a8ca714459481bd9fd315af2b5f92d99a6 (patch) | |
| tree | cf5ec812082840d228f67ef82e8be4d647ff3322 /arch/arm/imx-common | |
| parent | b68d6712c379735e886ef9c01b946bc36f295273 (diff) | |
| parent | 01968b96a24414ff8f0735111907cbb750c7af43 (diff) | |
| download | olio-uboot-2014.01-f04821a8ca714459481bd9fd315af2b5f92d99a6.tar.xz olio-uboot-2014.01-f04821a8ca714459481bd9fd315af2b5f92d99a6.zip | |
Merge remote-tracking branch 'u-boot-imx/master'
Diffstat (limited to 'arch/arm/imx-common')
| -rw-r--r-- | arch/arm/imx-common/iomux-v3.c | 5 | 
1 files changed, 3 insertions, 2 deletions
| diff --git a/arch/arm/imx-common/iomux-v3.c b/arch/arm/imx-common/iomux-v3.c index da093fbe1..08fad7851 100644 --- a/arch/arm/imx-common/iomux-v3.c +++ b/arch/arm/imx-common/iomux-v3.c @@ -54,9 +54,10 @@ int imx_iomux_v3_setup_pad(iomux_v3_cfg_t pad)  	return 0;  } -int imx_iomux_v3_setup_multiple_pads(iomux_v3_cfg_t *pad_list, unsigned count) +int imx_iomux_v3_setup_multiple_pads(iomux_v3_cfg_t const *pad_list, +				     unsigned count)  { -	iomux_v3_cfg_t *p = pad_list; +	iomux_v3_cfg_t const *p = pad_list;  	int i;  	int ret; |