summaryrefslogtreecommitdiffstats
path: root/drivers/bluetooth
diff options
context:
space:
mode:
authorMarcel Holtmann <marcel@holtmann.org>2009-06-09 15:44:03 +0200
committerMarcel Holtmann <marcel@holtmann.org>2009-08-22 14:25:33 -0700
commit08b0b0ce8c609b0e2284b134f0614e211374a038 (patch)
tree3b7b3b5cd72d2bb3c1fcbb13c14fb2e7e7f881f6 /drivers/bluetooth
parente7a25f9839fd392ec2c96e7e2b3734501d761a24 (diff)
downloadop-kernel-dev-08b0b0ce8c609b0e2284b134f0614e211374a038.zip
op-kernel-dev-08b0b0ce8c609b0e2284b134f0614e211374a038.tar.gz
Bluetooth: Fix compilation of Marvell driver without debugfs
The Makefile entry for the Marvell driver is broken when it comes to handling the optional DEBUG_FS correctly. That must have been the reason why they were using select in Kconfig in the first place. Fix this and make it really optional. Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'drivers/bluetooth')
-rw-r--r--drivers/bluetooth/Makefile4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/bluetooth/Makefile b/drivers/bluetooth/Makefile
index 75f70e0..b3f57d2 100644
--- a/drivers/bluetooth/Makefile
+++ b/drivers/bluetooth/Makefile
@@ -15,10 +15,12 @@ obj-$(CONFIG_BT_HCIBTUART) += btuart_cs.o
obj-$(CONFIG_BT_HCIBTUSB) += btusb.o
obj-$(CONFIG_BT_HCIBTSDIO) += btsdio.o
-btmrvl-objs := btmrvl_main.o btmrvl_debugfs.o
obj-$(CONFIG_BT_MRVL) += btmrvl.o
obj-$(CONFIG_BT_MRVL_SDIO) += btmrvl_sdio.o
+btmrvl-y := btmrvl_main.o
+btmrvl-$(CONFIG_DEBUG_FS) += btmrvl_debugfs.o
+
hci_uart-y := hci_ldisc.o
hci_uart-$(CONFIG_BT_HCIUART_H4) += hci_h4.o
hci_uart-$(CONFIG_BT_HCIUART_BCSP) += hci_bcsp.o
OpenPOWER on IntegriCloud