From patchwork Wed Oct 9 19:25:55 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Gardner X-Patchwork-Id: 281976 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id B709A2C0092 for ; Thu, 10 Oct 2013 06:26:09 +1100 (EST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1VTzOU-000827-4i; Wed, 09 Oct 2013 19:26:02 +0000 Received: from mail.tpi.com ([74.45.170.26]) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1VTzOP-00081n-D6 for kernel-team@lists.ubuntu.com; Wed, 09 Oct 2013 19:25:57 +0000 Received: from salmon.rtg.net (mail.tpi.com [10.0.0.205]) by mail.tpi.com (Postfix) with ESMTP id 44E3E3407F0 for ; Wed, 9 Oct 2013 12:25:56 -0700 (PDT) Received: by salmon.rtg.net (Postfix, from userid 1000) id 153C9225BF; Wed, 9 Oct 2013 13:25:56 -0600 (MDT) From: Tim Gardner To: kernel-team@lists.ubuntu.com Subject: [PATCH Saucy SRU] UBUNTU: [Config] CONFIG_USB_OTG=n for all arches Date: Wed, 9 Oct 2013 13:25:55 -0600 Message-Id: <1381346756-110769-1-git-send-email-tim.gardner@canonical.com> X-Mailer: git-send-email 1.7.9.5 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: kernel-team-bounces@lists.ubuntu.com BugLink: http://bugs.launchpad.net/bugs/1047527 Signed-off-by: Tim Gardner --- 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 CONFIG_USB_OHCI_HCD y note CONFIG_USB_UHCI_HCD y note CONFIG_USB_XHCI_HCD y note -CONFIG_USB_OTG p policy<(arch armel armhf &/ value y) | value n> note +CONFIG_USB_OTG n note # 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