regulator: tps65090: fix multiple regulator registration issue

[linux-2.6.git] / net / Makefile

diff --git a/net/Makefile b/net/Makefile
index 34e5b2d7f87783e568eb3b67b47598657c974815..572712dd5b42676dc3d83243397872fb142370af 100644 (file)
--- a/net/Makefile
+++ b/net/Makefile
@@ -19,13 +19,11 @@ 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_NET_SCHED)                += sched/
 obj-$(CONFIG_BRIDGE)           += bridge/
+obj-$(CONFIG_NET_DSA)          += dsa/
 obj-$(CONFIG_IPX)              += ipx/
 obj-$(CONFIG_ATALK)            += appletalk/
 obj-$(CONFIG_WAN_ROUTER)       += wanrouter/
@@ -34,25 +32,41 @@ obj-$(CONFIG_LAPB)          += lapb/
 obj-$(CONFIG_NETROM)           += netrom/
 obj-$(CONFIG_ROSE)             += rose/
 obj-$(CONFIG_AX25)             += ax25/
+obj-$(CONFIG_CAN)              += can/
 obj-$(CONFIG_IRDA)             += irda/
 obj-$(CONFIG_BT)               += bluetooth/
 obj-$(CONFIG_SUNRPC)           += sunrpc/
-obj-$(CONFIG_RXRPC)            += rxrpc/
 obj-$(CONFIG_AF_RXRPC)         += rxrpc/
 obj-$(CONFIG_ATM)              += atm/
+obj-$(CONFIG_L2TP)             += l2tp/
 obj-$(CONFIG_DECNET)           += decnet/
 obj-$(CONFIG_ECONET)           += econet/
-obj-$(CONFIG_VLAN_8021Q)       += 8021q/
+obj-$(CONFIG_PHONET)           += phonet/
+ifneq ($(CONFIG_VLAN_8021Q),)
+obj-y                          += 8021q/
+endif
 obj-$(CONFIG_IP_DCCP)          += dccp/
 obj-$(CONFIG_IP_SCTP)          += sctp/
-obj-y                          += wireless/
+obj-$(CONFIG_RDS)              += rds/
+obj-$(CONFIG_WIRELESS)         += wireless/
 obj-$(CONFIG_MAC80211)         += mac80211/
-obj-$(CONFIG_IEEE80211)                += ieee80211/
 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-$(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_NET_ACTIVITY_STATS)               += activity_stats.o