diff options
| author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-02-28 16:04:46 -0500 |
|---|---|---|
| committer | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-02-28 16:04:46 -0500 |
| commit | 6d4915f4f289e9452d5df136a185ee3edc67c943 (patch) | |
| tree | f2b46c700f5a0a3a0c5b7f89c762b7ebcd56d0f8 /arch/arm/mach-omap2/prcm_mpu44xx.h | |
| parent | 9a577aa8d55f8607e6f5ea6fb9d52780930d8373 (diff) | |
| parent | 02fa9f0451ac639a687bfc145eefe58703ff220e (diff) | |
Merge branch 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 into linaro-2.6.38linaro-linux-2.6.38-upstream-01Mar2011
Diffstat (limited to 'arch/arm/mach-omap2/prcm_mpu44xx.h')
| -rw-r--r-- | arch/arm/mach-omap2/prcm_mpu44xx.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/prcm_mpu44xx.h b/arch/arm/mach-omap2/prcm_mpu44xx.h index 729a644ce85..3300ff6e3cf 100644 --- a/arch/arm/mach-omap2/prcm_mpu44xx.h +++ b/arch/arm/mach-omap2/prcm_mpu44xx.h @@ -38,8 +38,8 @@ #define OMAP4430_PRCM_MPU_CPU1_INST 0x0800 /* PRCM_MPU clockdomain register offsets (from instance start) */ -#define OMAP4430_PRCM_MPU_CPU0_MPU_CDOFFS 0x0000 -#define OMAP4430_PRCM_MPU_CPU1_MPU_CDOFFS 0x0000 +#define OMAP4430_PRCM_MPU_CPU0_MPU_CDOFFS 0x0018 +#define OMAP4430_PRCM_MPU_CPU1_MPU_CDOFFS 0x0018 /* |