| Message ID | 20100112170818.3AB65F88D8@sepang.rtg.net |
|---|---|
| State | Accepted |
| Delegated to: | Andy Whitcroft |
| Headers | show |
Applied to Lucid. -apw
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
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 <tim.gardner@canonical.com> 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 <tim.gardner@canonical.com> --- 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(-)