[SRU][Utopic][PATCH 1/1] UBUNTU: [Config] Disable CONFIG_USB_OTG

[Joseph Salisbury]

BugLink: http://bugs.launchpad.net/bugs/1411295

Also disables CONFIG_USB_OTG_FSM and CONFIG_USB_ZERO_HNPTEST

Signed-off-by: Joseph Salisbury <joseph.salisbury at canonical.com>
---
 debian.master/config/config.common.ubuntu | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index a48ea160..a326a66 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -2258,7 +2258,6 @@ CONFIG_FSL_RIO=y
 CONFIG_FSL_SOC=y
 CONFIG_FSL_SOC_BOOKE=y
 # CONFIG_FSL_ULI1575 is not set
-# CONFIG_FSL_USB2_OTG is not set
 CONFIG_FSL_XGMAC_MDIO=y
 CONFIG_FSNOTIFY=y
 CONFIG_FS_ENET=m
@@ -7448,9 +7447,9 @@ CONFIG_USB_OHCI_HCD_OMAP3=m
 CONFIG_USB_OHCI_HCD_PCI=y
 # CONFIG_USB_OHCI_HCD_PPC_OF_LE is not set
 CONFIG_USB_OHCI_LITTLE_ENDIAN=y
-CONFIG_USB_OTG=y
+# CONFIG_USB_OTG is not set
 # CONFIG_USB_OTG_BLACKLIST_HUB is not set
-CONFIG_USB_OTG_FSM=m
+# CONFIG_USB_OTG_FSM is not set
 # CONFIG_USB_OTG_WHITELIST is not set
 CONFIG_USB_OXU210HP_HCD=m
 CONFIG_USB_PEGASUS=m
@@ -7598,7 +7597,6 @@ CONFIG_USB_XUSBATM=m
 CONFIG_USB_YUREX=m
 CONFIG_USB_ZD1201=m
 CONFIG_USB_ZERO=m
-CONFIG_USB_ZERO_HNPTEST=y
 CONFIG_USB_ZR364XX=m
 CONFIG_USELIB=y
 CONFIG_USER_NS=y
-- 
2.1.0