diff options
author | John W. Linville <linville@tuxdriver.com> | 2012-07-18 20:53:10 +0200 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-07-18 20:53:10 +0200 |
commit | 0cd06647b7c24f6633e32a505930a9aa70138c22 (patch) | |
tree | 8f2ca456dfd2c8deddf8dfb5d50a0db5b7dda916 /drivers/bluetooth/Makefile | |
parent | wlcore: increase command completion timeout (diff) | |
parent | Bluetooth: Introduce a flags variable to Three-wire UART state (diff) | |
download | linux-0cd06647b7c24f6633e32a505930a9aa70138c22.tar.xz linux-0cd06647b7c24f6633e32a505930a9aa70138c22.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
Diffstat (limited to 'drivers/bluetooth/Makefile')
-rw-r--r-- | drivers/bluetooth/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/bluetooth/Makefile b/drivers/bluetooth/Makefile index f4460f4f4b78..4afae20df512 100644 --- a/drivers/bluetooth/Makefile +++ b/drivers/bluetooth/Makefile @@ -28,4 +28,5 @@ 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-$(CONFIG_BT_HCIUART_ATH3K) += hci_ath.o +hci_uart-$(CONFIG_BT_HCIUART_3WIRE) += hci_h5.o hci_uart-objs := $(hci_uart-y) |