commit 1c8ffee6d835c15f2c81577a4c60b57a728d042c
author Linux Build Service Account <lnxbuild@localhost> Thu Nov 17 09:29:49 2011 -0800
committer QuIC Gerrit Code Review <code-review@localhost> Thu Nov 17 09:29:49 2011 -0800
tree 97092b6a932fec9659acf57bcb72b9e7e970c087
parent f8bd01c8bc5968e3c163788eadfac40d9bf65c25
parent 27a281db03266a20cd260b2254b25ff2fd0ab23e

Merge "defconfig: msm9615: Enable tethered RMNET over SMD DATA36 channel" into msm-3.0

arch/arm/configs/msm9615_defconfig

diff --git a/arch/arm/configs/msm9615_defconfig b/arch/arm/configs/msm9615_defconfig
index f255d3f..7059684 100644
--- a/arch/arm/configs/msm9615_defconfig
+++ b/arch/arm/configs/msm9615_defconfig
@@ -134,6 +134,8 @@
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_CI13XXX_MSM=y
 CONFIG_USB_G_ANDROID=y
+CONFIG_RMNET_SMD_CTL_CHANNEL="DATA36_CNTL"
+CONFIG_RMNET_SMD_DATA_CHANNEL="DATA36"
 CONFIG_MMC=y
 CONFIG_MMC_PERF_PROFILING=y
 CONFIG_MMC_UNSAFE_RESUME=y