commit f04755abd78ffd027a97183d03eaa7afa7ed5ef7
author Linux Build Service Account <lnxbuild@localhost> Mon Oct 28 04:09:42 2013 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Mon Oct 28 04:09:42 2013 -0700
tree a5c5b5141edc4f70433ad450a92f57838f928918
parent c18c26eebf72a566e829fe2de4d9e6f63f21718f
parent ddf811d28b348aea28099ae78de65f498f95ea9f

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

arch/arm/configs/msm8226-perf_defconfig

diff --git a/arch/arm/configs/msm8226-perf_defconfig b/arch/arm/configs/msm8226-perf_defconfig
index 03ed61f..2f38ebf 100644
--- a/arch/arm/configs/msm8226-perf_defconfig
+++ b/arch/arm/configs/msm8226-perf_defconfig
@@ -242,6 +242,9 @@
 CONFIG_PPPOE=y
 CONFIG_PPP_ASYNC=y
 CONFIG_PPP_SYNC_TTY=y
+CONFIG_PPPOLAC=y
+CONFIG_PPPOPNS=y
+CONFIG_PPP_MPPE=y
 CONFIG_USB_USBNET=y
 CONFIG_WCNSS_CORE=y
 CONFIG_WCNSS_CORE_PRONTO=y

arch/arm/configs/msm8226_defconfig

diff --git a/arch/arm/configs/msm8226_defconfig b/arch/arm/configs/msm8226_defconfig
index 8d116f1..8ca54fd 100644
--- a/arch/arm/configs/msm8226_defconfig
+++ b/arch/arm/configs/msm8226_defconfig
@@ -244,6 +244,9 @@
 CONFIG_PPPOE=y
 CONFIG_PPP_ASYNC=y
 CONFIG_PPP_SYNC_TTY=y
+CONFIG_PPPOLAC=y
+CONFIG_PPPOPNS=y
+CONFIG_PPP_MPPE=y
 CONFIG_USB_USBNET=y
 CONFIG_WCNSS_CORE=y
 CONFIG_WCNSS_CORE_PRONTO=y