summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorWanlong Gao <wanlong.gao@gmail.com>2011-04-10 03:04:18 +0800
committerRalf Baechle <ralf@linux-mips.org>2011-05-19 09:55:49 +0100
commitb32ee693eb106172f89639acff88dc8fee8ba3e2 (patch)
tree0ae6532cd3ff349b3b5d6ec381d3490e67ea9384 /arch
parent1c8da7a1107a46c94b21cc176aaf95c819aab3db (diff)
downloadlinux-3.10-b32ee693eb106172f89639acff88dc8fee8ba3e2.tar.gz
linux-3.10-b32ee693eb106172f89639acff88dc8fee8ba3e2.tar.bz2
linux-3.10-b32ee693eb106172f89639acff88dc8fee8ba3e2.zip
MIPS: Fix build warnings on defconfigs
Since d45dcef77019012fc6769e657fc2f1a5d681bbbb ["Bluetooth: Fix BT_L2CAP and BT_SCO in Kconfig"] BT_L2CAP=m and BT_SCO=m are no longer valid so change the settings from m to y. [ralf@linux-mips.org: Merging only the MIPS parts of this patch.] Signed-off-by: Wanlong Gao <wanlong.gao@gmail.com> To: akpm@linux-foundation.org To: manuel.lauss@googlemail.com Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org Cc: linux-mips@linux-mips.org Cc: linuxppc-dev@lists.ozlabs.org Patchwork: https://patchwork.linux-mips.org/patch/2277/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/mips/configs/lemote2f_defconfig4
-rw-r--r--arch/mips/configs/mtx1_defconfig4
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/mips/configs/lemote2f_defconfig b/arch/mips/configs/lemote2f_defconfig
index cb2c5eaa60f..b6acd2f256b 100644
--- a/arch/mips/configs/lemote2f_defconfig
+++ b/arch/mips/configs/lemote2f_defconfig
@@ -86,8 +86,8 @@ CONFIG_NET_SCHED=y
CONFIG_NET_EMATCH=y
CONFIG_NET_CLS_ACT=y
CONFIG_BT=m
-CONFIG_BT_L2CAP=m
-CONFIG_BT_SCO=m
+CONFIG_BT_L2CAP=y
+CONFIG_BT_SCO=y
CONFIG_BT_RFCOMM=m
CONFIG_BT_RFCOMM_TTY=y
CONFIG_BT_BNEP=m
diff --git a/arch/mips/configs/mtx1_defconfig b/arch/mips/configs/mtx1_defconfig
index a97a42c6b2c..37862b2ce36 100644
--- a/arch/mips/configs/mtx1_defconfig
+++ b/arch/mips/configs/mtx1_defconfig
@@ -225,8 +225,8 @@ CONFIG_TOSHIBA_FIR=m
CONFIG_VLSI_FIR=m
CONFIG_MCS_FIR=m
CONFIG_BT=m
-CONFIG_BT_L2CAP=m
-CONFIG_BT_SCO=m
+CONFIG_BT_L2CAP=y
+CONFIG_BT_SCO=y
CONFIG_BT_RFCOMM=m
CONFIG_BT_RFCOMM_TTY=y
CONFIG_BT_BNEP=m