diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-12-17 20:05:39 (GMT) |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-12-17 20:05:39 (GMT) |
commit | c95a44329e816d2f9da21b27e74615d5ee0d2333 (patch) | |
tree | 29eb5d2ec3b0bf2951886adff12b5f9c787815bd /arch/arm/plat-mxc/include/mach/mx27.h | |
parent | c613bbba6f39c8804f1f26e96fb68a117cc9e282 (diff) | |
parent | 47fee6fedd3ea08e9b0f1172bc74e59ee7a6b3d9 (diff) | |
download | linux-fsl-qoriq-c95a44329e816d2f9da21b27e74615d5ee0d2333.tar.xz |
Merge branch 'rmk-devel-mxc-pu-v2' of git://pasiphae.extern.pengutronix.de/git/imx/linux-2.6 into devel
Diffstat (limited to 'arch/arm/plat-mxc/include/mach/mx27.h')
-rw-r--r-- | arch/arm/plat-mxc/include/mach/mx27.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/plat-mxc/include/mach/mx27.h b/arch/arm/plat-mxc/include/mach/mx27.h index a86db64..aade46d 100644 --- a/arch/arm/plat-mxc/include/mach/mx27.h +++ b/arch/arm/plat-mxc/include/mach/mx27.h @@ -72,7 +72,8 @@ /* for mx27*/ #define OTG_BASE_ADDR USBOTG_BASE_ADDR #define SAHARA_BASE_ADDR (AIPI_BASE_ADDR + 0x25000) -#define EMMA_BASE_ADDR (AIPI_BASE_ADDR + 0x26400) +#define EMMA_PP_BASE_ADDR (AIPI_BASE_ADDR + 0x26000) +#define EMMA_PRP_BASE_ADDR (AIPI_BASE_ADDR + 0x26400) #define CCM_BASE_ADDR (AIPI_BASE_ADDR + 0x27000) #define SYSCTRL_BASE_ADDR (AIPI_BASE_ADDR + 0x27800) #define IIM_BASE_ADDR (AIPI_BASE_ADDR + 0x28000) |