From patchwork Tue Jul 13 13:53:53 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Gardner X-Patchwork-Id: 58778 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 C4925B6F1C for ; Tue, 13 Jul 2010 23:54:52 +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 1OYfwa-0006CV-6E; Tue, 13 Jul 2010 14:54:44 +0100 Received: from mail.tpi.com ([70.99.223.143]) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1OYfwY-0006C3-0G for kernel-team@lists.ubuntu.com; Tue, 13 Jul 2010 14:54:42 +0100 Received: from sepang.rtg.net (unknown [10.0.2.5]) by mail.tpi.com (Postfix) with ESMTP id 5A36D2560D2; Tue, 13 Jul 2010 06:54:23 -0700 (PDT) Received: by sepang.rtg.net (Postfix, from userid 1000) id 4D08BF891E; Tue, 13 Jul 2010 07:54:34 -0600 (MDT) From: Tim Gardner To: leann@canonical.com Subject: [PATCH] UBUNTU: [Config] CONFIG_NDISWRAPPER=m across all configs Date: Tue, 13 Jul 2010 07:53:53 -0600 Message-Id: <1279029233-10971-2-git-send-email-tim.gardner@canonical.com> X-Mailer: git-send-email 1.7.0.4 Cc: kernel-team@lists.ubuntu.com 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: , MIME-Version: 1.0 Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com Now that CONFIG_NDISWRAPPER depends on X86, we can just set it in one place. Signed-off-by: Tim Gardner --- 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 - 5 files changed, 1 insertions(+), 4 deletions(-) diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 index 03a1d8e..0f25e8e 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -140,7 +140,6 @@ CONFIG_MTD_SLRAM=m CONFIG_MTD_SM_COMMON=m CONFIG_MTD_SST25L=m CONFIG_MUTEX_SPIN_ON_OWNER=y -CONFIG_NDISWRAPPER=m CONFIG_NEED_DMA_MAP_STATE=y # CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set CONFIG_NET_CLS_CGROUP=y diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel index b948230..a40b19f 100644 --- a/debian.master/config/armel/config.common.armel +++ b/debian.master/config/armel/config.common.armel @@ -45,7 +45,6 @@ CONFIG_MTD_NAND_IDS=y # CONFIG_MTD_SM_COMMON is not set # CONFIG_MTD_SST25L is not set # CONFIG_MUTEX_SPIN_ON_OWNER is not set -# CONFIG_NDISWRAPPER is not set CONFIG_NEED_DMA_MAP_STATE=y # CONFIG_NET_POCKET is not set # CONFIG_PCCARD is not set diff --git a/debian.master/config/config.common.ports b/debian.master/config/config.common.ports index cbbe384..2aaddd2 100644 --- a/debian.master/config/config.common.ports +++ b/debian.master/config/config.common.ports @@ -2161,7 +2161,6 @@ CONFIG_NCPFS_OS2_NS=y CONFIG_NCPFS_PACKET_SIGNING=y CONFIG_NCPFS_STRONG=y CONFIG_NCP_FS=m -# CONFIG_NDISWRAPPER is not set CONFIG_NE2K_PCI=m CONFIG_NEED_MULTIPLE_NODES=y CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index f4a7a05..d755fc9 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -2747,6 +2747,7 @@ CONFIG_NCPFS_PACKET_SIGNING=y # CONFIG_NCPFS_SMALLDOS is not set CONFIG_NCPFS_STRONG=y CONFIG_NCP_FS=m +CONFIG_NDISWRAPPER=m CONFIG_NE2000=m CONFIG_NE2K_PCI=m CONFIG_NE2_MCA=m diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386 index 97cec96..e5c00b4 100644 --- a/debian.master/config/i386/config.common.i386 +++ b/debian.master/config/i386/config.common.i386 @@ -140,7 +140,6 @@ CONFIG_MTD_SLRAM=m CONFIG_MTD_SM_COMMON=m CONFIG_MTD_SST25L=m CONFIG_MUTEX_SPIN_ON_OWNER=y -CONFIG_NDISWRAPPER=m # CONFIG_NEED_DMA_MAP_STATE is not set # CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set CONFIG_NET_CLS_CGROUP=y