diff options
| author | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2015-10-24 02:08:33 +0200 |
|---|---|---|
| committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2015-10-24 02:08:33 +0200 |
| commit | f0b9ad5690ed96f95d91ca19fba2fb2894bae6f0 (patch) | |
| tree | d1b649e6f97ac0f1fc9864a296021c71cf69cd21 /net/Makefile | |
| parent | 272e77de798362c31e6452a46a0e7d5b6aaeb550 (diff) | |
| download | kernel_samsung_smdk4412-f0b9ad5690ed96f95d91ca19fba2fb2894bae6f0.zip kernel_samsung_smdk4412-f0b9ad5690ed96f95d91ca19fba2fb2894bae6f0.tar.gz kernel_samsung_smdk4412-f0b9ad5690ed96f95d91ca19fba2fb2894bae6f0.tar.bz2 | |
update network codemigrate_3.2
Diffstat (limited to 'net/Makefile')
| -rw-r--r-- | net/Makefile | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/net/Makefile b/net/Makefile index 11fee99..da0fdf5 100644 --- a/net/Makefile +++ b/net/Makefile @@ -9,7 +9,7 @@ obj-y := nonet.o obj-$(CONFIG_NET) := socket.o core/ -tmp-$(CONFIG_COMPAT) := compat.o +tmp-$(CONFIG_COMPAT) := compat.o obj-$(CONFIG_NET) += $(tmp-y) # LLC has to be linked before the files in net/802/ @@ -37,12 +37,8 @@ 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/ @@ -56,11 +52,7 @@ endif obj-$(CONFIG_IP_DCCP) += dccp/ obj-$(CONFIG_IP_SCTP) += sctp/ obj-$(CONFIG_RDS) += rds/ -ifeq ($(CONFIG_MACH_PX),y) -obj-$(CONFIG_WIRELESS) += wireless_ath/ -else obj-$(CONFIG_WIRELESS) += wireless/ -endif obj-$(CONFIG_MAC80211) += mac80211/ obj-$(CONFIG_TIPC) += tipc/ obj-$(CONFIG_NETLABEL) += netlabel/ @@ -81,3 +73,4 @@ obj-$(CONFIG_DNS_RESOLVER) += dns_resolver/ obj-$(CONFIG_CEPH_LIB) += ceph/ obj-$(CONFIG_BATMAN_ADV) += batman-adv/ obj-$(CONFIG_NET_ACTIVITY_STATS) += activity_stats.o +obj-$(CONFIG_NFC) += nfc/ |