summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBowen Sun <bsun@nvidia.com>2010-07-21 17:14:05 -0700
committerYu-Huan Hsu <yhsu@nvidia.com>2010-07-21 17:50:51 -0700
commit436425be8fb86b7318e106c2d57041ab4e585658 (patch)
treee0adc4092aadeeace47413f15afae930435292a0
parentf2a7108a11cb874faf8fb3ff7eee44721a6b9e18 (diff)
[arm] harmony: enable USB_ANDROID_ADB
Bug 678046 Change-Id: If9b208a47e77e9c57c02d89c4c133933a82249df Reviewed-on: http://git-master/r/4095 Reviewed-by: Bowen Sun <bsun@nvidia.com> Tested-by: Bowen Sun <bsun@nvidia.com> Reviewed-by: Yu-Huan Hsu <yhsu@nvidia.com>
-rw-r--r--arch/arm/configs/tegra_harmony_gnu_linux_defconfig11
1 files changed, 6 insertions, 5 deletions
diff --git a/arch/arm/configs/tegra_harmony_gnu_linux_defconfig b/arch/arm/configs/tegra_harmony_gnu_linux_defconfig
index aef6a876d6a1..961e46b3f4d2 100644
--- a/arch/arm/configs/tegra_harmony_gnu_linux_defconfig
+++ b/arch/arm/configs/tegra_harmony_gnu_linux_defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.32.9
-# Mon Jul 19 16:30:58 2010
+# Wed Jul 21 11:03:19 2010
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -394,9 +394,6 @@ CONFIG_PM_SLEEP=y
CONFIG_SUSPEND=y
CONFIG_SUSPEND_FREEZER=y
# CONFIG_WAKELOCK is not set
-# CONFIG_NO_USER_SPACE_SCREEN_ACCESS_CONTROL is not set
-# CONFIG_CONSOLE_EARLYSUSPEND is not set
-# CONFIG_FB_EARLYSUSPEND is not set
# CONFIG_APM_EMULATION is not set
# CONFIG_PM_RUNTIME is not set
CONFIG_ARCH_SUSPEND_POSSIBLE=y
@@ -1474,7 +1471,11 @@ CONFIG_USB_GADGET_DUALSPEED=y
# CONFIG_USB_G_SERIAL is not set
# CONFIG_USB_MIDI_GADGET is not set
# CONFIG_USB_G_PRINTER is not set
-# CONFIG_USB_ANDROID is not set
+CONFIG_USB_ANDROID=y
+# CONFIG_USB_ANDROID_ACM is not set
+CONFIG_USB_ANDROID_ADB=y
+# CONFIG_USB_ANDROID_MASS_STORAGE is not set
+# CONFIG_USB_ANDROID_RNDIS is not set
# CONFIG_USB_CDC_COMPOSITE is not set
#