diff options
| author | David S. Miller <davem@davemloft.net> | 2010-02-01 02:34:58 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-02-01 02:34:58 -0500 |
| commit | 1e98cadb0d2b9f945f35beee4a0ce667f3c6dbe4 (patch) | |
| tree | 0b5940be30331d461cd4421abe7829b392ab6e62 /drivers/bluetooth/Makefile | |
| parent | 71cc1fa9f2d71eb2eba9b8e71e27cff9863e55f3 (diff) | |
| parent | 6bf8268f9a91f1065c99503161ebd061492bebe3 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6
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 b3f57d2d4eb0..7e5aed598121 100644 --- a/drivers/bluetooth/Makefile +++ b/drivers/bluetooth/Makefile | |||
| @@ -15,6 +15,7 @@ obj-$(CONFIG_BT_HCIBTUART) += btuart_cs.o | |||
| 15 | obj-$(CONFIG_BT_HCIBTUSB) += btusb.o | 15 | obj-$(CONFIG_BT_HCIBTUSB) += btusb.o |
| 16 | obj-$(CONFIG_BT_HCIBTSDIO) += btsdio.o | 16 | obj-$(CONFIG_BT_HCIBTSDIO) += btsdio.o |
| 17 | 17 | ||
| 18 | obj-$(CONFIG_BT_ATH3K) += ath3k.o | ||
| 18 | obj-$(CONFIG_BT_MRVL) += btmrvl.o | 19 | obj-$(CONFIG_BT_MRVL) += btmrvl.o |
| 19 | obj-$(CONFIG_BT_MRVL_SDIO) += btmrvl_sdio.o | 20 | obj-$(CONFIG_BT_MRVL_SDIO) += btmrvl_sdio.o |
| 20 | 21 | ||