diff options
| author | Stefano Babic <sbabic@denx.de> | 2013-04-21 11:32:19 +0200 |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2013-04-21 11:32:19 +0200 |
| commit | cd53034613d7bf4a38b673f5c7c0dc2dfe0519c4 (patch) | |
| tree | 3fd9296d1c1b42ec0df3a02fa916c84729378a00 /arch/arm/include/asm/imx-common | |
| parent | f2e8a87305a55652488af140adcf65b1e688f287 (diff) | |
| parent | e9fd66defd7ed23e7847c418b684f42b9d427493 (diff) | |
| download | u-boot-imx-cd53034613d7bf4a38b673f5c7c0dc2dfe0519c4.zip u-boot-imx-cd53034613d7bf4a38b673f5c7c0dc2dfe0519c4.tar.gz u-boot-imx-cd53034613d7bf4a38b673f5c7c0dc2dfe0519c4.tar.bz2 | |
Merge branch 'next'
Diffstat (limited to 'arch/arm/include/asm/imx-common')
| -rw-r--r-- | arch/arm/include/asm/imx-common/iomux-v3.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/include/asm/imx-common/iomux-v3.h b/arch/arm/include/asm/imx-common/iomux-v3.h index c34bb76..70bf3cd 100644 --- a/arch/arm/include/asm/imx-common/iomux-v3.h +++ b/arch/arm/include/asm/imx-common/iomux-v3.h @@ -97,8 +97,8 @@ typedef u64 iomux_v3_cfg_t; #define MUX_CONFIG_SION (0x1 << 4) -int imx_iomux_v3_setup_pad(iomux_v3_cfg_t pad); -int imx_iomux_v3_setup_multiple_pads(iomux_v3_cfg_t const *pad_list, +void imx_iomux_v3_setup_pad(iomux_v3_cfg_t pad); +void imx_iomux_v3_setup_multiple_pads(iomux_v3_cfg_t const *pad_list, unsigned count); #endif /* __MACH_IOMUX_V3_H__*/ |