diff options
| author | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-14 21:43:34 -0800 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:52:40 -0800 |
| commit | 5aa5c1d129e3f9e416532b118820a8db9581c7a9 (patch) | |
| tree | 3f45f42eab2011c9071a862b6975a345b4fdc0ea /arch | |
| parent | e965e74155fb0c02461c08bae916e5c50ae9a971 (diff) | |
ARM: config: tegra[3]_android: Switch to new Android composite driver
Change-Id: I942bfca76a7a4bc454fc2bdbc0096828a1d7d3c9
Signed-off-by: Dan Willemsen <dwillemsen@nvidia.com>
Reviewed-on: http://git-master/r/66297
Reviewed-by: Simone Willett <swillett@nvidia.com>
Tested-by: Simone Willett <swillett@nvidia.com>
Rebase-Id: R610b177beec1da6d4d91c857b86701ae3754de8a
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/configs/tegra3_android_defconfig | 6 | ||||
| -rw-r--r-- | arch/arm/configs/tegra_android_defconfig | 6 |
2 files changed, 2 insertions, 10 deletions
diff --git a/arch/arm/configs/tegra3_android_defconfig b/arch/arm/configs/tegra3_android_defconfig index 4096f55d5193..325a580889fd 100644 --- a/arch/arm/configs/tegra3_android_defconfig +++ b/arch/arm/configs/tegra3_android_defconfig @@ -331,11 +331,7 @@ CONFIG_USB_SERIAL_BASEBAND=m CONFIG_USB_GADGET=y CONFIG_USB_GADGET_VBUS_DRAW=500 CONFIG_USB_FSL_USB2=y -CONFIG_USB_ANDROID=y -CONFIG_USB_ANDROID_ADB=y -CONFIG_USB_ANDROID_MASS_STORAGE=y -CONFIG_USB_ANDROID_MTP=y -CONFIG_USB_ANDROID_RNDIS=y +CONFIG_USB_G_ANDROID=y CONFIG_USB_TEGRA_OTG=y CONFIG_MMC=y CONFIG_MMC_EMBEDDED_SDIO=y diff --git a/arch/arm/configs/tegra_android_defconfig b/arch/arm/configs/tegra_android_defconfig index 1bd2e8a3f5e4..788d63990ac9 100644 --- a/arch/arm/configs/tegra_android_defconfig +++ b/arch/arm/configs/tegra_android_defconfig @@ -302,11 +302,7 @@ CONFIG_USB_SERIAL_OPTION=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_VBUS_DRAW=500 CONFIG_USB_FSL_USB2=y -CONFIG_USB_ANDROID=y -CONFIG_USB_ANDROID_ADB=y -CONFIG_USB_ANDROID_MASS_STORAGE=y -CONFIG_USB_ANDROID_MTP=y -CONFIG_USB_ANDROID_RNDIS=y +CONFIG_USB_G_ANDROID=y CONFIG_USB_TEGRA_OTG=y CONFIG_MMC=y CONFIG_MMC_EMBEDDED_SDIO=y |