Skip to content
Permalink
Browse files

Merge branch 'cm-10.1' into ubuntu

  • Loading branch information
Dazzozo committed May 19, 2013
2 parents 515320c + 0060d69 commit f5f4310a3aa3b6ed6ca43968510773dac618ad3f
Showing with 2 additions and 2 deletions.
  1. +2 −2 arch/arm/mach-msm/board-msm7x27a.c
@@ -238,10 +238,10 @@ static struct msm_i2c_platform_data msm_gsbi1_qup_i2c_pdata = {
};

#ifdef CONFIG_ARCH_MSM7X27A
#define MSM_PMEM_MDP_SIZE 0x1A00000
#define MSM_PMEM_MDP_SIZE 0x2300000
#define MSM7x25A_MSM_PMEM_MDP_SIZE 0x1500000

#define MSM_PMEM_ADSP_SIZE 0xC00000
#define MSM_PMEM_ADSP_SIZE 0x1100000
#define MSM7x25A_MSM_PMEM_ADSP_SIZE 0xB91000


0 comments on commit f5f4310

Please sign in to comment.
You can’t perform that action at this time.