diff options
| author | Tom Rini <trini@ti.com> | 2012-12-22 05:55:19 -0700 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2012-12-22 05:55:19 -0700 |
| commit | da77a0e593c370c9ed79ea22c1df321d5f4e4bbf (patch) | |
| tree | d31ff68d217a80422845c82104098eef744f4cde /drivers/video/ipu_regs.h | |
| parent | ba6d4b64b33146740a15b3dd5a5f511a2bc8d6f6 (diff) | |
| parent | 96764df1b47ddebfb50fadf5af72530b07b5fc89 (diff) | |
| download | u-boot-imx-da77a0e593c370c9ed79ea22c1df321d5f4e4bbf.zip u-boot-imx-da77a0e593c370c9ed79ea22c1df321d5f4e4bbf.tar.gz u-boot-imx-da77a0e593c370c9ed79ea22c1df321d5f4e4bbf.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'drivers/video/ipu_regs.h')
| -rw-r--r-- | drivers/video/ipu_regs.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/ipu_regs.h b/drivers/video/ipu_regs.h index a43aa03..982e252 100644 --- a/drivers/video/ipu_regs.h +++ b/drivers/video/ipu_regs.h @@ -55,7 +55,7 @@ #define IPU_TPM_REG_BASE 0x01060000 #define IPU_DC_TMPL_REG_BASE 0x01080000 #define IPU_ISP_TBPR_REG_BASE 0x010C0000 -#elif defined(CONFIG_MX6Q) +#elif defined(CONFIG_MX6) #define IPU_CPMEM_REG_BASE 0x00100000 #define IPU_LUT_REG_BASE 0x00120000 #define IPU_SRM_REG_BASE 0x00140000 |