git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.kernel.org:/home/rmk/linux-2.6-arm
[sfrench/cifs-2.6.git]
/
drivers
/
bluetooth
/
Makefile
diff --git
a/drivers/bluetooth/Makefile
b/drivers/bluetooth/Makefile
index b3f57d2d4eb0e46298ec991010db526237ecf110..7e5aed59812109d70de6cf495f43fb7382e09884 100644
(file)
--- a/
drivers/bluetooth/Makefile
+++ b/
drivers/bluetooth/Makefile
@@
-15,6
+15,7
@@
obj-$(CONFIG_BT_HCIBTUART) += btuart_cs.o
obj-$(CONFIG_BT_HCIBTUSB) += btusb.o
obj-$(CONFIG_BT_HCIBTSDIO) += btsdio.o
+obj-$(CONFIG_BT_ATH3K) += ath3k.o
obj-$(CONFIG_BT_MRVL) += btmrvl.o
obj-$(CONFIG_BT_MRVL_SDIO) += btmrvl_sdio.o