commit | f82fbb4c6f08b529b4df8021ece2e62712c43706 | [log] [tgz] |
---|---|---|
author | Linux Build Service Account <lnxbuild@localhost> | Sun Dec 29 18:59:08 2013 -0800 |
committer | Gerrit - the friendly Code Review server <code-review@localhost> | Sun Dec 29 18:59:07 2013 -0800 |
tree | 9ed2bc919539c61ea076b532d8202447be6c9d89 | |
parent | edc227951df7431025a52f89377719d72b572ec8 [diff] | |
parent | 8323f97bca21aff21597375005d71742c96c8e02 [diff] |
Merge "kernel: enable internaldb on perf build"
diff --git a/arch/arm/configs/msm8226-perf_defconfig b/arch/arm/configs/msm8226-perf_defconfig index 1e32cfa..c13f18f 100644 --- a/arch/arm/configs/msm8226-perf_defconfig +++ b/arch/arm/configs/msm8226-perf_defconfig
@@ -216,6 +216,7 @@ CONFIG_BT_HCISMD=y CONFIG_CFG80211=y CONFIG_NL80211_TESTMODE=y +CONFIG_CFG80211_INTERNAL_REGDB=y CONFIG_CMA=y CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_RAM=y
diff --git a/arch/arm/configs/msm8610-perf_defconfig b/arch/arm/configs/msm8610-perf_defconfig index ffa2310..bd135b3 100644 --- a/arch/arm/configs/msm8610-perf_defconfig +++ b/arch/arm/configs/msm8610-perf_defconfig
@@ -206,6 +206,7 @@ CONFIG_BT_HCISMD=y CONFIG_CFG80211=y CONFIG_NL80211_TESTMODE=y +CONFIG_CFG80211_INTERNAL_REGDB=y CONFIG_CMA=y CONFIG_CMA_SIZE_MBYTES=4 CONFIG_BLK_DEV_LOOP=y
diff --git a/arch/arm/configs/msm8974-perf_defconfig b/arch/arm/configs/msm8974-perf_defconfig index 10f2919..d442371 100755 --- a/arch/arm/configs/msm8974-perf_defconfig +++ b/arch/arm/configs/msm8974-perf_defconfig
@@ -245,6 +245,7 @@ CONFIG_MSM_BT_POWER=y CONFIG_CFG80211=y CONFIG_NL80211_TESTMODE=y +CONFIG_CFG80211_INTERNAL_REGDB=y CONFIG_RFKILL=y CONFIG_GENLOCK=y CONFIG_GENLOCK_MISCDEVICE=y