From patchwork Mon May 24 05:51:03 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leann Ogasawara X-Patchwork-Id: 53378 X-Patchwork-Delegate: leann.ogasawara@canonical.com 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 50CCCB7D79 for ; Mon, 24 May 2010 15:51:30 +1000 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1OGQZS-0007yu-5e; Mon, 24 May 2010 06:51:26 +0100 Received: from adelie.canonical.com ([91.189.90.139]) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1OGQZP-0007xZ-QV for kernel-team@lists.ubuntu.com; Mon, 24 May 2010 06:51:23 +0100 Received: from hutte.canonical.com ([91.189.90.181]) by adelie.canonical.com with esmtp (Exim 4.69 #1 (Debian)) id 1OGQZP-0005gt-Lu for ; Mon, 24 May 2010 06:51:23 +0100 Received: from c-76-105-148-120.hsd1.or.comcast.net ([76.105.148.120] helo=[192.168.1.4]) by hutte.canonical.com with esmtpsa (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.69) (envelope-from ) id 1OGQZP-0006PW-8X for kernel-team@lists.ubuntu.com; Mon, 24 May 2010 06:51:23 +0100 Subject: [PATCH 2/4] UBUNTU: [Config] Enable CONFIG_USB=y for armel and sparc From: Leann Ogasawara To: kernel-team In-Reply-To: <1274680079.24569.3462.camel@emiko> References: <1274680079.24569.3462.camel@emiko> Date: Sun, 23 May 2010 22:51:03 -0700 Message-ID: <1274680263.24569.3474.camel@emiko> Mime-Version: 1.0 X-Mailer: Evolution 2.28.3 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.9 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com >From 460ac8e341d0411126efff0cbf591fde17f72b59 Mon Sep 17 00:00:00 2001 From: Leann Ogasawara Date: Sun, 23 May 2010 09:35:12 -0700 Subject: [PATCH 2/4] UBUNTU: [Config] Enable CONFIG_USB=y for armel and sparc CONFIG_USB was inconsistent between archs. Set CONFIG_USB=y for armel and sparc to make this config option consistent amongst all archs. Signed-off-by: Leann Ogasawara --- debian.master/config/amd64/config.common.amd64 | 1 - debian.master/config/armel/config.common.armel | 1 - debian.master/config/config.common.ports | 1 + debian.master/config/config.common.ubuntu | 1 + debian.master/config/i386/config.common.i386 | 1 - debian.master/config/ia64/config.common.ia64 | 1 - debian.master/config/powerpc/config.common.powerpc | 1 - debian.master/config/sparc/config.common.sparc | 1 - 8 files changed, 2 insertions(+), 6 deletions(-) diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 index 026de82..fa1b0f1 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -144,7 +144,6 @@ CONFIG_TCG_TPM=m CONFIG_TCP_CONG_ADVANCED=y CONFIG_TIPC=m CONFIG_UNIXWARE_DISKLABEL=y -CONFIG_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_GADGET=m CONFIG_USB_ISP1362_HCD=m diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel index b45489b..9e461ce 100644 --- a/debian.master/config/armel/config.common.armel +++ b/debian.master/config/armel/config.common.armel @@ -129,7 +129,6 @@ CONFIG_STANDALONE=y # CONFIG_TCP_CONG_ADVANCED is not set # CONFIG_TIPC is not set # CONFIG_UNIXWARE_DISKLABEL is not set -CONFIG_USB=m CONFIG_USB_EHCI_HCD=m # CONFIG_USB_GADGET is not set # CONFIG_USB_ISP1362_HCD is not set diff --git a/debian.master/config/config.common.ports b/debian.master/config/config.common.ports index 924c4ed..90f7f3e 100644 --- a/debian.master/config/config.common.ports +++ b/debian.master/config/config.common.ports @@ -3618,6 +3618,7 @@ CONFIG_UNIX=y CONFIG_UNIX98_PTYS=y CONFIG_UNUSED_SYMBOLS=y CONFIG_US3_MC=m +CONFIG_USB=y CONFIG_USBPCWATCHDOG=m CONFIG_USB_ACM=m CONFIG_USB_ADUTUX=m diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index 75f672b..f7ceeed 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -4143,6 +4143,7 @@ CONFIG_ULTRIX_PARTITION=y CONFIG_UNIX=y CONFIG_UNIX98_PTYS=y CONFIG_UNUSED_SYMBOLS=y +CONFIG_USB=y CONFIG_USBPCWATCHDOG=m CONFIG_USB_ACM=m CONFIG_USB_ADUTUX=m diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386 index d24f949..1f0f00a 100644 --- a/debian.master/config/i386/config.common.i386 +++ b/debian.master/config/i386/config.common.i386 @@ -144,7 +144,6 @@ CONFIG_TCG_TPM=m CONFIG_TCP_CONG_ADVANCED=y CONFIG_TIPC=m CONFIG_UNIXWARE_DISKLABEL=y -CONFIG_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_GADGET=m CONFIG_USB_ISP1362_HCD=m diff --git a/debian.master/config/ia64/config.common.ia64 b/debian.master/config/ia64/config.common.ia64 index 92f8e93..56406bd 100644 --- a/debian.master/config/ia64/config.common.ia64 +++ b/debian.master/config/ia64/config.common.ia64 @@ -242,7 +242,6 @@ CONFIG_UBIFS_FS=m # CONFIG_UFS_FS is not set CONFIG_ULTRIX_PARTITION=y CONFIG_UNIXWARE_DISKLABEL=y -CONFIG_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_GADGET=m CONFIG_USB_GADGET_DUALSPEED=y diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc index 668167e..277dda9 100644 --- a/debian.master/config/powerpc/config.common.powerpc +++ b/debian.master/config/powerpc/config.common.powerpc @@ -212,7 +212,6 @@ CONFIG_TR=y CONFIG_UFS_FS=m CONFIG_ULTRIX_PARTITION=y CONFIG_UNIXWARE_DISKLABEL=y -CONFIG_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_GADGET=m CONFIG_USB_HIDDEV=y diff --git a/debian.master/config/sparc/config.common.sparc b/debian.master/config/sparc/config.common.sparc index 1686b39..d40de47 100644 --- a/debian.master/config/sparc/config.common.sparc +++ b/debian.master/config/sparc/config.common.sparc @@ -250,7 +250,6 @@ CONFIG_UBIFS_FS=m CONFIG_UFS_FS=m # CONFIG_ULTRIX_PARTITION is not set # CONFIG_UNIXWARE_DISKLABEL is not set -CONFIG_USB=m CONFIG_USB_EHCI_HCD=m CONFIG_USB_GADGET=y CONFIG_USB_GADGET_DUALSPEED=y