diff options
| author | codeworkx <codeworkx@cyanogenmod.com> | 2012-09-22 09:48:20 +0200 |
|---|---|---|
| committer | codeworkx <codeworkx@cyanogenmod.com> | 2012-09-22 14:02:16 +0200 |
| commit | 2489007e7d740ccbc3e0a202914e243ad5178787 (patch) | |
| tree | b8e6380ea7b1da63474ad68a5dba997e01146043 /net/Makefile | |
| parent | 5f67568eb31e3a813c7c52461dcf66ade15fc2e7 (diff) | |
| download | kernel_samsung_smdk4412-2489007e7d740ccbc3e0a202914e243ad5178787.zip kernel_samsung_smdk4412-2489007e7d740ccbc3e0a202914e243ad5178787.tar.gz kernel_samsung_smdk4412-2489007e7d740ccbc3e0a202914e243ad5178787.tar.bz2 | |
merge opensource jb u5
Change-Id: I1aaec157aa196f3448eff8636134fce89a814cf2
Diffstat (limited to 'net/Makefile')
| -rw-r--r-- | net/Makefile | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/Makefile b/net/Makefile index 358bcfd..11fee99 100644 --- a/net/Makefile +++ b/net/Makefile @@ -37,8 +37,12 @@ obj-$(CONFIG_IRDA) += irda/ ifeq ($(CONFIG_BT_MGMT),y) obj-$(CONFIG_BT) += bluetooth_mgmt/ else +ifeq ($(CONFIG_BT_TIZEN),y) +obj-$(CONFIG_BT) += bluetooth_tizen/ +else obj-$(CONFIG_BT) += bluetooth/ endif +endif obj-$(CONFIG_SUNRPC) += sunrpc/ obj-$(CONFIG_AF_RXRPC) += rxrpc/ obj-$(CONFIG_ATM) += atm/ |