From patchwork Sat Feb 26 01:41:25 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Gustavo F. Padovan" X-Patchwork-Id: 84635 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 37DF4B7169 for ; Sat, 26 Feb 2011 12:41:15 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751104Ab1BZBlF (ORCPT ); Fri, 25 Feb 2011 20:41:05 -0500 Received: from mail-yi0-f46.google.com ([209.85.218.46]:60810 "EHLO mail-yi0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750797Ab1BZBlD (ORCPT ); Fri, 25 Feb 2011 20:41:03 -0500 Received: by yia27 with SMTP id 27so64873yia.19 for ; Fri, 25 Feb 2011 17:41:03 -0800 (PST) Received: by 10.150.198.18 with SMTP id v18mr4442775ybf.248.1298684462991; Fri, 25 Feb 2011 17:41:02 -0800 (PST) Received: from localhost.localdomain ([187.106.51.126]) by mx.google.com with ESMTPS id g63sm799296yhd.15.2011.02.25.17.41.00 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 25 Feb 2011 17:41:02 -0800 (PST) From: "Gustavo F. Padovan" To: davem@davemloft.net Cc: linville@tuxdriver.com, linux-bluetooth@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH] Bluetooth: Fix BT_L2CAP and BT_SCO in Kconfig Date: Fri, 25 Feb 2011 22:41:25 -0300 Message-Id: <1298684485-3081-1-git-send-email-padovan@profusion.mobi> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <20110226013639.GA2166@joana> References: <20110226013639.GA2166@joana> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org If we want something "bool" built-in in something "tristate" it can't "depend on" the tristate config option. Report by DaveM: I give it 'y' just to make it happen, for both, and afterways no matter how many times I rerun "make oldconfig" I keep seeing things like this in my build: scripts/kconfig/conf --silentoldconfig Kconfig include/config/auto.conf:986:warning: symbol value 'm' invalid for BT_SCO include/config/auto.conf:3156:warning: symbol value 'm' invalid for BT_L2CAP Reported-by: David S. Miller Signed-off-by: Gustavo F. Padovan --- net/bluetooth/Kconfig | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/net/bluetooth/Kconfig b/net/bluetooth/Kconfig index c6f9c2f..6ae5ec5 100644 --- a/net/bluetooth/Kconfig +++ b/net/bluetooth/Kconfig @@ -31,9 +31,10 @@ menuconfig BT to Bluetooth kernel modules are provided in the BlueZ packages. For more information, see . +if BT != n + config BT_L2CAP bool "L2CAP protocol support" - depends on BT select CRC16 help L2CAP (Logical Link Control and Adaptation Protocol) provides @@ -42,11 +43,12 @@ config BT_L2CAP config BT_SCO bool "SCO links support" - depends on BT help SCO link provides voice transport over Bluetooth. SCO support is required for voice applications like Headset and Audio. +endif + source "net/bluetooth/rfcomm/Kconfig" source "net/bluetooth/bnep/Kconfig"