diff options
author | Wolfgang Denk <wd@denx.de> | 2012-07-18 10:47:03 +0200 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2012-07-18 10:47:03 +0200 |
commit | 66714b1a6df0a5a9f1656a6d4e6eea3c7ecdf7ae (patch) | |
tree | 946a13465467eb58f68cf8cf5e121017d380fe2a /drivers/video/cfb_console.c | |
parent | 3a9469b5cbd467b3a7b176b4feb2073a04f294b6 (diff) | |
parent | cf65d478ab4e0bb0247c374e6b0b40ef77eddbe8 (diff) | |
download | blackbird-obmc-uboot-66714b1a6df0a5a9f1656a6d4e6eea3c7ecdf7ae.tar.gz blackbird-obmc-uboot-66714b1a6df0a5a9f1656a6d4e6eea3c7ecdf7ae.zip |
Merge branch 'next' of git://git.denx.de/u-boot-video
* 'next' of git://git.denx.de/u-boot-video:
ipu_common: Add ldb_clk for use in parenting the pixel clock
ipu_common: Do not hardcode the ipu_clk frequency
ipu_common: Rename MXC_CCM_BASE
ipu_common: Let clk_ipu_enable/disable only run on MX51 and MX53
ipu_common: Only apply the erratum to MX51
video: Rename CONFIG_VIDEO_MX5
mx6: Allow mx6 to access the IPUv3 registers
common lcd: minor coding style changes
Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'drivers/video/cfb_console.c')
-rw-r--r-- | drivers/video/cfb_console.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/cfb_console.c b/drivers/video/cfb_console.c index 92fa77d27f..19d061f6cb 100644 --- a/drivers/video/cfb_console.c +++ b/drivers/video/cfb_console.c @@ -164,7 +164,7 @@ /* * Defines for the i.MX31 driver (mx3fb.c) */ -#if defined(CONFIG_VIDEO_MX3) || defined(CONFIG_VIDEO_MX5) +#if defined(CONFIG_VIDEO_MX3) || defined(CONFIG_VIDEO_IPUV3) #define VIDEO_FB_16BPP_WORD_SWAP #endif |