diff options
| author | Tom Rini <trini@konsulko.com> | 2016-12-18 13:54:25 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-12-18 17:43:20 -0500 |
| commit | 8ea05705a70135a94419b0d243666c1b51fe1f8d (patch) | |
| tree | 495da728ccebe411445c144fb88ba35041db2096 /arch/arm/include/asm/arch-mx6/clock.h | |
| parent | 0b4bc1b3ab1850fccbade3e6103f2036f6bdb364 (diff) | |
| parent | 854bb75be98ad792ff64c26ae38a1392ea185cd6 (diff) | |
Merge branch 'master' of git://www.denx.de/git/u-boot-imx
Migrate CONFIG_ARCH_USE_MEMSET/MEMCPY with this merge.
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'arch/arm/include/asm/arch-mx6/clock.h')
| -rw-r--r-- | arch/arm/include/asm/arch-mx6/clock.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/include/asm/arch-mx6/clock.h b/arch/arm/include/asm/arch-mx6/clock.h index ed1433ebc68..2d9c45e255d 100644 --- a/arch/arm/include/asm/arch-mx6/clock.h +++ b/arch/arm/include/asm/arch-mx6/clock.h @@ -74,7 +74,7 @@ int enable_spi_clk(unsigned char enable, unsigned spi_num); void enable_ipu_clock(void); int enable_fec_anatop_clock(int fec_id, enum enet_freq freq); void enable_enet_clk(unsigned char enable); -int enable_lcdif_clock(u32 base_addr); +int enable_lcdif_clock(u32 base_addr, bool enable); void enable_qspi_clk(int qspi_num); void enable_thermal_clk(void); void mxs_set_lcdclk(u32 base_addr, u32 freq); |