tg3: Migrate tg3_flags to phy_flags

[net-next-2.6.git] / net / Makefile

diff --git a/net/Makefile b/net/Makefile
index 1542e7268a7baa01ee4a6cb6d620a849057e795c..41d420070a38cb2001cfacfb34835dfb45659573 100644 (file)
--- a/net/Makefile
+++ b/net/Makefile
@@ -40,6 +40,7 @@ obj-$(CONFIG_BT)              += bluetooth/
 obj-$(CONFIG_SUNRPC)           += sunrpc/
 obj-$(CONFIG_AF_RXRPC)         += rxrpc/
 obj-$(CONFIG_ATM)              += atm/
+obj-$(CONFIG_L2TP)             += l2tp/
 obj-$(CONFIG_DECNET)           += decnet/
 obj-$(CONFIG_ECONET)           += econet/
 obj-$(CONFIG_PHONET)           += phonet/
@@ -49,17 +50,18 @@ 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/
 obj-$(CONFIG_IUCV)             += iucv/
 obj-$(CONFIG_RFKILL)           += rfkill/
 obj-$(CONFIG_NET_9P)           += 9p/
+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