summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Wylder <jwylder@motorola.com>2014-02-03 19:19:46 -0600
committerJames Wylder <jwylder@motorola.com>2014-03-05 17:47:15 -0600
commit8f0e54d10053fd5a6680f516d5dd8a23c5129a63 (patch)
treebc0bf89be0c0f91df80fe511a9a992dc1fa72e1b
parentf412d1fd7e8fba654047bbf240d5c444f880bb12 (diff)
downloadolio-linux-3.10-8f0e54d10053fd5a6680f516d5dd8a23c5129a63.tar.xz
olio-linux-3.10-8f0e54d10053fd5a6680f516d5dd8a23c5129a63.zip
IKXCLOCK-165 config: minnow enable usb_otg_wakelock
Enable upstream OTG_WAKELOCK code for minnow Change-Id: I8f24308c59da2ea22363e3a318fa4e80d49c10a6 Reviewed-on: http://gerrit.pcs.mot.com/607997 SLTApproved: Slta Waiver <sltawvr@motorola.com> Tested-by: Jira Key <jirakey@motorola.com> Reviewed-by: Douglas Zobel <dzobel1@motorola.com> Submit-Approved: Jira Key <jirakey@motorola.com>
-rw-r--r--arch/arm/configs/eng_minnow_defconfig1
-rw-r--r--arch/arm/configs/minnow_defconfig1
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/configs/eng_minnow_defconfig b/arch/arm/configs/eng_minnow_defconfig
index dd46a9e2b4b..7da75df4e09 100644
--- a/arch/arm/configs/eng_minnow_defconfig
+++ b/arch/arm/configs/eng_minnow_defconfig
@@ -1873,6 +1873,7 @@ CONFIG_MUSB_PIO_ONLY=y
# CONFIG_USB_EZUSB_FX2 is not set
# CONFIG_USB_HSIC_USB3503 is not set
CONFIG_USB_PHY=y
+CONFIG_USB_OTG_WAKELOCK=y
# CONFIG_NOP_USB_XCEIV is not set
# CONFIG_OMAP_CONTROL_USB is not set
# CONFIG_OMAP_USB2 is not set
diff --git a/arch/arm/configs/minnow_defconfig b/arch/arm/configs/minnow_defconfig
index 83b1836fb57..39d1e001216 100644
--- a/arch/arm/configs/minnow_defconfig
+++ b/arch/arm/configs/minnow_defconfig
@@ -1864,6 +1864,7 @@ CONFIG_MUSB_PIO_ONLY=y
# CONFIG_USB_EZUSB_FX2 is not set
# CONFIG_USB_HSIC_USB3503 is not set
CONFIG_USB_PHY=y
+CONFIG_USB_OTG_WAKELOCK=y
# CONFIG_NOP_USB_XCEIV is not set
# CONFIG_OMAP_CONTROL_USB is not set
# CONFIG_OMAP_USB2 is not set