netns xfrm: fix "ip xfrm state|policy count" misreport

[safe/jmp/linux-2.6] / drivers / bluetooth / Makefile

diff --git a/drivers/bluetooth/Makefile b/drivers/bluetooth/Makefile
index 75f70e0..b3f57d2 100644 (file)
--- 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