aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2013-04-25 17:05:09 +0200
committerArnd Bergmann <arnd@arndb.de>2013-04-29 16:39:09 +0200
commit21bdcc1a2ffce8c9bc7caad711401fff47f99c00 (patch)
tree88d40f49b0201751b7e968450a4f1edaa48b8468
parentMerge tag 'davinci-for-v3.10/board-2-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/boards (diff)
downloadlinux-dev-21bdcc1a2ffce8c9bc7caad711401fff47f99c00.tar.xz
linux-dev-21bdcc1a2ffce8c9bc7caad711401fff47f99c00.zip
ARM: msm: USB_MSM_OTG needs USB_PHY
The Kconfig entry for USB_EHCI_MSM unconditionally selects USB_MSM_OTG, which is now only visible when USB_PHY is also enabled. A dependency for this has been added in the USB tree, this adds the now missing bit in the defconfig. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
-rw-r--r--arch/arm/configs/msm_defconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/configs/msm_defconfig b/arch/arm/configs/msm_defconfig
index 44f929167d7e..690b5f9c7462 100644
--- a/arch/arm/configs/msm_defconfig
+++ b/arch/arm/configs/msm_defconfig
@@ -101,6 +101,7 @@ CONFIG_SND_DYNAMIC_MINORS=y
CONFIG_SND_SOC=y
CONFIG_HID_BATTERY_STRENGTH=y
CONFIG_USB=y
+CONFIG_USB_PHY=y
CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
CONFIG_USB_MON=y
CONFIG_USB_EHCI_HCD=y