Update to 3.4-final.

[linux-flexiantxendom0-3.2.10.git] / net / Makefile

diff --git a/net/Makefile b/net/Makefile
index cb7bdc1..ad432fa 100644 (file)
--- a/net/Makefile
+++ b/net/Makefile
@@ -19,9 +19,7 @@ obj-$(CONFIG_NETFILTER)               += netfilter/
 obj-$(CONFIG_INET)             += ipv4/
 obj-$(CONFIG_XFRM)             += xfrm/
 obj-$(CONFIG_UNIX)             += unix/
-ifneq ($(CONFIG_IPV6),)
-obj-y                          += ipv6/
-endif
+obj-$(CONFIG_NET)              += ipv6/
 obj-$(CONFIG_PACKET)           += packet/
 obj-$(CONFIG_NET_KEY)          += key/
 obj-$(CONFIG_BRIDGE)           += bridge/
@@ -50,7 +48,7 @@ endif
 obj-$(CONFIG_IP_DCCP)          += dccp/
 obj-$(CONFIG_IP_SCTP)          += sctp/
 obj-$(CONFIG_RDS)              += rds/
-obj-y                          += wireless/
+obj-$(CONFIG_WIRELESS)         += wireless/
 obj-$(CONFIG_MAC80211)         += mac80211/
 obj-$(CONFIG_TIPC)             += tipc/
 obj-$(CONFIG_NETLABEL)         += netlabel/
@@ -61,9 +59,14 @@ obj-$(CONFIG_CAIF)           += caif/
 ifneq ($(CONFIG_DCB),)
 obj-y                          += dcb/
 endif
-obj-y                          += ieee802154/
+obj-$(CONFIG_IEEE802154)       += ieee802154/
 
 ifeq ($(CONFIG_NET),y)
 obj-$(CONFIG_SYSCTL)           += sysctl_net.o
 endif
 obj-$(CONFIG_WIMAX)            += wimax/
+obj-$(CONFIG_DNS_RESOLVER)     += dns_resolver/
+obj-$(CONFIG_CEPH_LIB)         += ceph/
+obj-$(CONFIG_BATMAN_ADV)       += batman-adv/
+obj-$(CONFIG_NFC)              += nfc/
+obj-$(CONFIG_OPENVSWITCH)      += openvswitch/