diff options
author | Marcel Holtmann <marcel@holtmann.org> | 2009-06-09 09:44:03 -0400 |
---|---|---|
committer | Marcel Holtmann <marcel@holtmann.org> | 2009-08-22 17:25:33 -0400 |
commit | 08b0b0ce8c609b0e2284b134f0614e211374a038 (patch) | |
tree | 3b7b3b5cd72d2bb3c1fcbb13c14fb2e7e7f881f6 | |
parent | e7a25f9839fd392ec2c96e7e2b3734501d761a24 (diff) |
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>
-rw-r--r-- | drivers/bluetooth/Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/bluetooth/Makefile b/drivers/bluetooth/Makefile index 75f70e0e3e53..b3f57d2d4eb0 100644 --- a/drivers/bluetooth/Makefile +++ b/drivers/bluetooth/Makefile | |||
@@ -15,10 +15,12 @@ obj-$(CONFIG_BT_HCIBTUART) += btuart_cs.o | |||
15 | obj-$(CONFIG_BT_HCIBTUSB) += btusb.o | 15 | obj-$(CONFIG_BT_HCIBTUSB) += btusb.o |
16 | obj-$(CONFIG_BT_HCIBTSDIO) += btsdio.o | 16 | obj-$(CONFIG_BT_HCIBTSDIO) += btsdio.o |
17 | 17 | ||
18 | btmrvl-objs := btmrvl_main.o btmrvl_debugfs.o | ||
19 | obj-$(CONFIG_BT_MRVL) += btmrvl.o | 18 | obj-$(CONFIG_BT_MRVL) += btmrvl.o |
20 | obj-$(CONFIG_BT_MRVL_SDIO) += btmrvl_sdio.o | 19 | obj-$(CONFIG_BT_MRVL_SDIO) += btmrvl_sdio.o |
21 | 20 | ||
21 | btmrvl-y := btmrvl_main.o | ||
22 | btmrvl-$(CONFIG_DEBUG_FS) += btmrvl_debugfs.o | ||
23 | |||
22 | hci_uart-y := hci_ldisc.o | 24 | hci_uart-y := hci_ldisc.o |
23 | hci_uart-$(CONFIG_BT_HCIUART_H4) += hci_h4.o | 25 | hci_uart-$(CONFIG_BT_HCIUART_H4) += hci_h4.o |
24 | hci_uart-$(CONFIG_BT_HCIUART_BCSP) += hci_bcsp.o | 26 | hci_uart-$(CONFIG_BT_HCIUART_BCSP) += hci_bcsp.o |