[PATCH Saucy SRU] UBUNTU: [Config] CONFIG_USB_OTG=n for all arches

[Tim Gardner]

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

Signed-off-by: Tim Gardner <tim.gardner at canonical.com>
---
 debian.master/config/annotations          |    2 +-
 debian.master/config/config.common.ubuntu |    3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index 7e5722d..fa9d6ca 100644
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -351,7 +351,7 @@ CONFIG_USB_EHCI_HCD				y note<ensures USB 2.0/1.1 probe ordering>
 CONFIG_USB_OHCI_HCD				y note<ensures USB 2.0/1.1 probe ordering>
 CONFIG_USB_UHCI_HCD				y note<ensures USB 2.0/1.1 probe ordering>
 CONFIG_USB_XHCI_HCD				y note<ensures USB 2.0/1.1 probe ordering>
-CONFIG_USB_OTG					p policy<(arch armel armhf &/ value y) | value n> note<triggers breakage on x86>
+CONFIG_USB_OTG					n note<triggers breakage on x86>
 #  options:
 CONFIG_BRCMFMAC_USB				y
 CONFIG_COMEDI_USB_DRIVERS			y
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 1191b1b..9579c2f 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -6466,7 +6466,7 @@ CONFIG_USB_OHCI_HCD=y
 CONFIG_USB_OHCI_HCD_OMAP3=y
 CONFIG_USB_OHCI_HCD_PCI=m
 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_WHITELIST is not set
 CONFIG_USB_OXU210HP_HCD=m
@@ -6620,7 +6620,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_USER_RETURN_NOTIFIER=y
 CONFIG_USER_STACKTRACE_SUPPORT=y
-- 
1.7.9.5