From patchwork Tue Jan 12 17:08:18 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Gardner X-Patchwork-Id: 42736 X-Patchwork-Delegate: apw@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 CAB5E1007D2 for ; Wed, 13 Jan 2010 04:07:57 +1100 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1NUkDe-0005zi-1B; Tue, 12 Jan 2010 17:07:50 +0000 Received: from mail.tpi.com ([70.99.223.143]) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1NUkDb-0005zA-4x for kernel-team@lists.ubuntu.com; Tue, 12 Jan 2010 17:07:47 +0000 Received: from sepang.rtg.net (unknown [10.0.2.5]) by mail.tpi.com (Postfix) with ESMTP id 2A82221436C; Tue, 12 Jan 2010 09:07:18 -0800 (PST) Received: by sepang.rtg.net (Postfix, from userid 1000) id 3AB65F88D8; Tue, 12 Jan 2010 10:08:18 -0700 (MST) To: apw@canonical.com Subject: Lucid request pull, CONFIG_BT=m Message-Id: <20100112170818.3AB65F88D8@sepang.rtg.net> Date: Tue, 12 Jan 2010 10:08:18 -0700 (MST) From: timg@tpi.com (Tim Gardner) 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 The following changes since commit 9935581d8aa598c953d8d63021b75eaf2d12a635: Tim Gardner (1): UBUNTU: [Upstream] b43: Declare all possible firmware files. are available in the git repository at: git://kernel.ubuntu.com/rtg/ubuntu-lucid CONFIG_BM Tim Gardner (1): UBUNTU: [Config] CONFIG_BT=m debian.master/config/amd64/config.common.amd64 | 2 +- debian.master/config/config.common.ubuntu | 6 +++--- debian.master/config/i386/config.common.i386 | 2 +- debian.master/config/lpia/config.common.lpia | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) From b256acafff77e6255e057c5acc37dcef7dfa577f Mon Sep 17 00:00:00 2001 From: Tim Gardner Date: Tue, 12 Jan 2010 09:36:16 -0700 Subject: [PATCH] UBUNTU: [Config] CONFIG_BT=m This makes its possible for compat-wireless to update bluetooth modules. Signed-off-by: Tim Gardner --- debian.master/config/amd64/config.common.amd64 | 2 +- debian.master/config/config.common.ubuntu | 6 +++--- debian.master/config/i386/config.common.i386 | 2 +- debian.master/config/lpia/config.common.lpia | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 index 18cb8f6..d5f4ee6 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -27,7 +27,7 @@ CONFIG_BONDING=m CONFIG_BRIDGE=m CONFIG_BSD_DISKLABEL=y CONFIG_BSD_PROCESS_ACCT=y -CONFIG_BT=y +CONFIG_BT=m # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set CONFIG_CDROM_PKTCDVD=y CONFIG_CIFS=m diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index 4c84f12..0bea3f9 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -447,12 +447,12 @@ CONFIG_BT_HCIUART_H4=y CONFIG_BT_HCIUART_LL=y CONFIG_BT_HCIVHCI=m CONFIG_BT_HIDP=m -CONFIG_BT_L2CAP=y +CONFIG_BT_L2CAP=m CONFIG_BT_MRVL=m CONFIG_BT_MRVL_SDIO=m -CONFIG_BT_RFCOMM=y +CONFIG_BT_RFCOMM=m CONFIG_BT_RFCOMM_TTY=y -CONFIG_BT_SCO=y +CONFIG_BT_SCO=m CONFIG_BUG=y CONFIG_C101=m CONFIG_C2PORT=m diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386 index f8cf60d..f3f5b95 100644 --- a/debian.master/config/i386/config.common.i386 +++ b/debian.master/config/i386/config.common.i386 @@ -26,7 +26,7 @@ CONFIG_BONDING=m CONFIG_BRIDGE=m CONFIG_BSD_DISKLABEL=y CONFIG_BSD_PROCESS_ACCT=y -CONFIG_BT=y +CONFIG_BT=m # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set CONFIG_CDROM_PKTCDVD=y CONFIG_CIFS=m diff --git a/debian.master/config/lpia/config.common.lpia b/debian.master/config/lpia/config.common.lpia index 6fdaf8e..453d702 100644 --- a/debian.master/config/lpia/config.common.lpia +++ b/debian.master/config/lpia/config.common.lpia @@ -27,7 +27,7 @@ CONFIG_BONDING=m CONFIG_BRIDGE=m CONFIG_BSD_DISKLABEL=y CONFIG_BSD_PROCESS_ACCT=y -CONFIG_BT=y +CONFIG_BT=m # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set CONFIG_CDROM_PKTCDVD=y CONFIG_CIFS=m