commit | bc91a494c018352c1be8e7084995edb53d7c1805 | [log] [tgz] |
---|---|---|
author | Linux Build Service Account <lnxbuild@localhost> | Wed Mar 06 21:36:57 2013 -0800 |
committer | Gerrit - the friendly Code Review server <code-review@localhost> | Wed Mar 06 21:36:57 2013 -0800 |
tree | f17f9e1404e35f0c25a996ef1b362785ffabb912 | |
parent | 902ef5a2b947fed11acf8d889878299cf5c9b2c6 [diff] | |
parent | 53d8c19603852616bf0b0520f3219277bdf66bf1 [diff] |
Merge "defconfig: msm8974: Enable CMA"
diff --git a/arch/arm/configs/msm8974-perf_defconfig b/arch/arm/configs/msm8974-perf_defconfig index 5c03630..d36d5a2 100644 --- a/arch/arm/configs/msm8974-perf_defconfig +++ b/arch/arm/configs/msm8974-perf_defconfig
@@ -234,6 +234,7 @@ CONFIG_GENLOCK_MISCDEVICE=y CONFIG_SYNC=y CONFIG_SW_SYNC=y +CONFIG_CMA=y CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_RAM=y CONFIG_HAPTIC_ISA1200=y
diff --git a/arch/arm/configs/msm8974_defconfig b/arch/arm/configs/msm8974_defconfig index faa0471..df0b5f0 100644 --- a/arch/arm/configs/msm8974_defconfig +++ b/arch/arm/configs/msm8974_defconfig
@@ -238,6 +238,7 @@ CONFIG_GENLOCK_MISCDEVICE=y CONFIG_SYNC=y CONFIG_SW_SYNC=y +CONFIG_CMA=y CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_RAM=y CONFIG_TSPP=m