Skip to content

Commit

Permalink
Merge branch 'cm-10.1' into ubuntu
Browse files Browse the repository at this point in the history
  • Loading branch information
Daz Jones committed May 19, 2013
2 parents 515320c + 0060d69 commit f5f4310
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions arch/arm/mach-msm/board-msm7x27a.c
Original file line number Diff line number Diff line change
Expand Up @@ -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


Expand Down

0 comments on commit f5f4310

Please sign in to comment.