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 0fab1f0318dfb1ce26b8c6f58cf30c461e72fbc5..9aebb460a34777ed9e942824d3b338c3104fe512 100644 (file)
--- a/drivers/bluetooth/Makefile
+++ b/drivers/bluetooth/Makefile
@@ -2,7 +2,6 @@
 # Makefile for the Linux Bluetooth HCI device drivers.
 #
 
-obj-$(CONFIG_BT_HCIUSB)                += hci_usb.o
 obj-$(CONFIG_BT_HCIVHCI)       += hci_vhci.o
 obj-$(CONFIG_BT_HCIUART)       += hci_uart.o
 obj-$(CONFIG_BT_HCIBCM203X)    += bcm203x.o