From: Frederic Danis <frederic.danis@linux.intel.com>
To: linux-bluetooth@vger.kernel.org
Subject: [PATCH v2 2/4] net: rfkill: gpio: Make BCM2E39 support optional
Date: Fri, 7 Aug 2015 17:00:38 +0200 [thread overview]
Message-ID: <1438959640-15476-3-git-send-email-frederic.danis@linux.intel.com> (raw)
In-Reply-To: <1438959640-15476-1-git-send-email-frederic.danis@linux.intel.com>
In case of kernel configured to build Bluetooth BCM UART driver, do not
support BCM2E39 in rfkill-gpio.
Signed-off-by: Frederic Danis <frederic.danis@linux.intel.com>
---
net/rfkill/rfkill-gpio.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/net/rfkill/rfkill-gpio.c b/net/rfkill/rfkill-gpio.c
index d5d58d9..16d7a3a 100644
--- a/net/rfkill/rfkill-gpio.c
+++ b/net/rfkill/rfkill-gpio.c
@@ -164,7 +164,9 @@ static int rfkill_gpio_remove(struct platform_device *pdev)
#ifdef CONFIG_ACPI
static const struct acpi_device_id rfkill_acpi_match[] = {
{ "BCM2E1A", RFKILL_TYPE_BLUETOOTH },
+#ifndef CONFIG_BT_HCIUART_BCM
{ "BCM2E39", RFKILL_TYPE_BLUETOOTH },
+#endif
{ "BCM2E3D", RFKILL_TYPE_BLUETOOTH },
{ "BCM2E40", RFKILL_TYPE_BLUETOOTH },
{ "BCM2E64", RFKILL_TYPE_BLUETOOTH },
--
1.9.1
next prev parent reply other threads:[~2015-08-07 15:00 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-07 15:00 [PATCH v2 0/4] Bluetooth: hci_bcm: Add ACPI and PM support Frederic Danis
2015-08-07 15:00 ` [PATCH v2 1/4] Bluetooth: hci_bcm: Add PM for BCM devices Frederic Danis
2015-08-07 16:41 ` Marcel Holtmann
2015-08-10 15:59 ` Frederic Danis
2015-08-10 8:00 ` Luka Karinja
2015-08-10 14:57 ` Frederic Danis
2015-08-23 10:44 ` Luka Karinja
2015-09-04 14:08 ` Frederic Danis
2015-08-07 15:00 ` Frederic Danis [this message]
2015-08-07 16:42 ` [PATCH v2 2/4] net: rfkill: gpio: Make BCM2E39 support optional Marcel Holtmann
2015-08-07 15:00 ` [PATCH v2 3/4] Bluetooth: hci_bcm: Retrieve UART speed from ACPI Frederic Danis
2015-08-07 15:00 ` [PATCH v2 4/4] Bluetooth: hci_bcm: Add suspend/resume PM functions Frederic Danis
2015-08-07 16:45 ` [PATCH v2 0/4] Bluetooth: hci_bcm: Add ACPI and PM support Marcel Holtmann
2015-08-10 15:50 ` Frederic Danis
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1438959640-15476-3-git-send-email-frederic.danis@linux.intel.com \
--to=frederic.danis@linux.intel.com \
--cc=linux-bluetooth@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).