Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / drivers / bluetooth / Makefile

diff --git a/drivers/bluetooth/Makefile b/drivers/bluetooth/Makefile
index 18aa038db1367d655d98b810c3bc8ba22f8862cb..0fab1f0318dfb1ce26b8c6f58cf30c461e72fbc5 100644 (file)
--- a/drivers/bluetooth/Makefile
+++ b/drivers/bluetooth/Makefile
@@ -13,8 +13,13 @@ obj-$(CONFIG_BT_HCIBT3C)     += bt3c_cs.o
 obj-$(CONFIG_BT_HCIBLUECARD)   += bluecard_cs.o
 obj-$(CONFIG_BT_HCIBTUART)     += btuart_cs.o
 obj-$(CONFIG_BT_HCIBRF6150)    += brf6150.o
+obj-$(CONFIG_BT_HCIH4P)                += hci_h4p/
+
+obj-$(CONFIG_BT_HCIBTUSB)      += btusb.o
+obj-$(CONFIG_BT_HCIBTSDIO)     += btsdio.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
+hci_uart-$(CONFIG_BT_HCIUART_LL)       += hci_ll.o
 hci_uart-objs                          := $(hci_uart-y)