summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSheshagiri Shenoy <sshenoy@nvidia.com>2011-10-12 17:38:19 -0700
committerVarun Colbert <vcolbert@nvidia.com>2011-10-13 15:34:49 -0700
commit016a4e3666e13b1205b5b9d680d31d073c115b31 (patch)
treeaa4dd8101f14d7e772d7c30f22b8e259f05dd067
parent8aad17d3e8cce86dc5d0a4330302b75d62cde68d (diff)
arm: tegra3: config: Enable built-in CDC ACM driver
CDC ACM driver needs to be built in and should not be a module that is (manually or via scripts) loaded every time. bug 886181 Change-Id: Ib211eff977ccbf2fb595fdb7d32593d534547f7b Reviewed-on: http://git-master/r/57708 Reviewed-by: Sheshagiri Shenoy <sshenoy@nvidia.com> Tested-by: Sheshagiri Shenoy <sshenoy@nvidia.com> Reviewed-by: Michael Hsu <mhsu@nvidia.com> Reviewed-by: Steve Lin <stlin@nvidia.com> Tested-by: Gerrit_Virtual_Submit Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
-rw-r--r--arch/arm/configs/tegra3_android_defconfig4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/configs/tegra3_android_defconfig b/arch/arm/configs/tegra3_android_defconfig
index dbdcd1bbb08b..da9e94df70d8 100644
--- a/arch/arm/configs/tegra3_android_defconfig
+++ b/arch/arm/configs/tegra3_android_defconfig
@@ -249,6 +249,7 @@ CONFIG_BATTERY_BQ20Z75=y
CONFIG_BATTERY_BQ27x00=y
CONFIG_CHARGER_TPS8003X=y
CONFIG_BATTERY_GAUGE_TPS8003X=y
+CONFIG_CHARGER_GPIO=y
CONFIG_SENSORS_TEGRA_TSENSOR=y
CONFIG_SENSORS_INA219=y
CONFIG_MFD_TPS6586X=y
@@ -301,7 +302,7 @@ CONFIG_USB_OTG=y
# CONFIG_USB_OTG_WHITELIST is not set
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_EHCI_ONOFF_FEATURE=y
-CONFIG_USB_ACM=m
+CONFIG_USB_ACM=y
CONFIG_USB_WDM=y
CONFIG_USB_STORAGE=y
CONFIG_USB_LIBUSUAL=y
@@ -327,7 +328,6 @@ CONFIG_RTC_CLASS=y
CONFIG_RTC_DRV_TPS6586X=y
CONFIG_RTC_DRV_TPS6591x=y
CONFIG_RTC_DRV_TPS80031=y
-CONFIG_CHARGER_GPIO=y
CONFIG_STAGING=y
# CONFIG_STAGING_EXCLUDE_BUILD is not set
CONFIG_ANDROID=y