commit 22063ac1d907dfa8cae4ea53c16749be1e653766
author Linux Build Service Account <lnxbuild@localhost> Mon Oct 28 04:09:45 2013 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Mon Oct 28 04:09:45 2013 -0700
tree 41aab896b218d455173c10be4e466b1b00d84dbb
parent f04755abd78ffd027a97183d03eaa7afa7ed5ef7
parent 8764aab87d55ac555686a3691581198bdd421567

Merge "defconfig: msm8610: add VPN support for msm8610"

arch/arm/configs/msm8610-perf_defconfig

diff --git a/arch/arm/configs/msm8610-perf_defconfig b/arch/arm/configs/msm8610-perf_defconfig
index 20c6362..d5f7489 100644
--- a/arch/arm/configs/msm8610-perf_defconfig
+++ b/arch/arm/configs/msm8610-perf_defconfig
@@ -407,6 +407,9 @@
 CONFIG_PPP_DEFLATE=y
 CONFIG_PPP_BSDCOMP=y
 CONFIG_PPPOE=y
+CONFIG_PPPOLAC=y
+CONFIG_PPPOPNS=y
+CONFIG_PPP_MPPE=y
 CONFIG_N_HDLC=y
 CONFIG_UNIX98_PTYS=y
 CONFIG_INPUT_KXTJ9=y

arch/arm/configs/msm8610_defconfig

diff --git a/arch/arm/configs/msm8610_defconfig b/arch/arm/configs/msm8610_defconfig
index 0a7faae..de29a3b 100644
--- a/arch/arm/configs/msm8610_defconfig
+++ b/arch/arm/configs/msm8610_defconfig
@@ -461,6 +461,9 @@
 CONFIG_PPP_DEFLATE=y
 CONFIG_PPP_BSDCOMP=y
 CONFIG_PPPOE=y
+CONFIG_PPPOLAC=y
+CONFIG_PPPOPNS=y
+CONFIG_PPP_MPPE=y
 CONFIG_N_HDLC=y
 CONFIG_UNIX98_PTYS=y
 CONFIG_INPUT_KXTJ9=y