From patchwork Tue Oct 23 14:56:37 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Gardner X-Patchwork-Id: 193503 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id 6B0672C0084 for ; Wed, 24 Oct 2012 01:56:58 +1100 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1TQfuM-0007cu-5b; Tue, 23 Oct 2012 14:56:42 +0000 Received: from mail.tpi.com ([70.99.223.143]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1TQfuJ-0007cg-KZ for kernel-team@lists.ubuntu.com; Tue, 23 Oct 2012 14:56:40 +0000 Received: from salmon.rtg.net (mail.tpi.com [70.99.223.143]) by mail.tpi.com (Postfix) with ESMTP id B1D41108ED6 for ; Tue, 23 Oct 2012 07:56:37 -0700 (PDT) Received: by salmon.rtg.net (Postfix, from userid 1000) id 45A5120E4D; Tue, 23 Oct 2012 08:56:37 -0600 (MDT) From: Tim Gardner To: kernel-team@lists.ubuntu.com Subject: [PATCH] UBUNTU: [Config] CONFIG_USB_OTG=n for all but armel/armhf Date: Tue, 23 Oct 2012 08:56:37 -0600 Message-Id: <1351004197-5434-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.13 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com BugLink: http://bugs.launchpad.net/bugs/1047527 This restores OTG behavior as it is in Precise. Signed-off-by: Tim Gardner --- debian.master/config/amd64/config.common.amd64 | 1 + debian.master/config/armel/config.common.armel | 1 + debian.master/config/armhf/config.common.armhf | 1 + debian.master/config/config.common.ubuntu | 1 - debian.master/config/i386/config.common.i386 | 1 + debian.master/config/powerpc/config.common.powerpc | 1 + debian.master/config/ppc64/config.common.ppc64 | 1 + 7 files changed, 6 insertions(+), 1 deletion(-) diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 index 23a18ff..db194af 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -246,6 +246,7 @@ CONFIG_USB_MUSB_TUSB6010=m # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set CONFIG_USB_OHCI_HCD_PLATFORM=y +# CONFIG_USB_OTG is not set CONFIG_VFAT_FS=y CONFIG_VGASTATE=m CONFIG_VGA_ARB_MAX_GPUS=16 diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel index e76ed0a..a7b5ba6 100644 --- a/debian.master/config/armel/config.common.armel +++ b/debian.master/config/armel/config.common.armel @@ -246,6 +246,7 @@ CONFIG_USB_MUSB_HDRC=m # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set # CONFIG_USB_OHCI_HCD_PLATFORM is not set +CONFIG_USB_OTG=y CONFIG_VFAT_FS=y # CONFIG_VGASTATE is not set # CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf index 58fa449..ca4e604 100644 --- a/debian.master/config/armhf/config.common.armhf +++ b/debian.master/config/armhf/config.common.armhf @@ -92,6 +92,7 @@ CONFIG_TWL4030_USB=y # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set # CONFIG_USB_OHCI_HCD_PLATFORM is not set +CONFIG_USB_OTG=y CONFIG_VFAT_FS=y # CONFIG_VGASTATE is not set # CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index 44b36e4..473591a 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -5912,7 +5912,6 @@ CONFIG_USB_OHCI_HCD_PPC_OF=y CONFIG_USB_OHCI_HCD_PPC_OF_BE=y CONFIG_USB_OHCI_LITTLE_ENDIAN=y # CONFIG_USB_OMAP is not set -CONFIG_USB_OTG=y # CONFIG_USB_OTG_BLACKLIST_HUB is not set CONFIG_USB_OTG_UTILS=y # CONFIG_USB_OTG_WHITELIST is not set diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386 index 0dd1848..d1bb7fd 100644 --- a/debian.master/config/i386/config.common.i386 +++ b/debian.master/config/i386/config.common.i386 @@ -245,6 +245,7 @@ CONFIG_USB_MUSB_TUSB6010=m # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set CONFIG_USB_OHCI_HCD_PLATFORM=y +# CONFIG_USB_OTG is not set CONFIG_VFAT_FS=y CONFIG_VGASTATE=m CONFIG_VGA_ARB_MAX_GPUS=16 diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc index 5a41232..9ee3c7e 100644 --- a/debian.master/config/powerpc/config.common.powerpc +++ b/debian.master/config/powerpc/config.common.powerpc @@ -239,6 +239,7 @@ CONFIG_USB_OHCI_BIG_ENDIAN_DESC=y CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y CONFIG_USB_OHCI_HCD_PLATFORM=y # CONFIG_USB_OHCI_HCD_PPC_OF_LE is not set +# CONFIG_USB_OTG is not set CONFIG_VFAT_FS=m CONFIG_VGASTATE=m CONFIG_VGA_ARB_MAX_GPUS=16 diff --git a/debian.master/config/ppc64/config.common.ppc64 b/debian.master/config/ppc64/config.common.ppc64 index fd03351..6e5f058 100644 --- a/debian.master/config/ppc64/config.common.ppc64 +++ b/debian.master/config/ppc64/config.common.ppc64 @@ -274,6 +274,7 @@ CONFIG_USB_OHCI_BIG_ENDIAN_DESC=y CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y CONFIG_USB_OHCI_HCD_PLATFORM=y CONFIG_USB_OHCI_HCD_PPC_OF_LE=y +# CONFIG_USB_OTG is not set CONFIG_VFAT_FS=m CONFIG_VGASTATE=m CONFIG_VGA_ARB_MAX_GPUS=64