From: Jeff Garzik <jgarzik@pobox.com>
Date: Thu, 1 Sep 2005 22:02:01 +0000 (-0400)
Subject: /spare/repo/netdev-2.6 branch 'master'
X-Git-Tag: v2.6.14-rc1~1017^2^2
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e3ee3b78f83688a0ae4315e8be71b2eac559904a;p=linux-2.6

/spare/repo/netdev-2.6 branch 'master'
---

e3ee3b78f83688a0ae4315e8be71b2eac559904a
diff --cc net/Makefile
index 83bc52d87b,7e6eff206c..4aa2f46d2a
--- a/net/Makefile
+++ b/net/Makefile
@@@ -41,8 -42,8 +42,9 @@@ obj-$(CONFIG_ATM)		+= atm
  obj-$(CONFIG_DECNET)		+= decnet/
  obj-$(CONFIG_ECONET)		+= econet/
  obj-$(CONFIG_VLAN_8021Q)	+= 8021q/
+ obj-$(CONFIG_IP_DCCP)		+= dccp/
  obj-$(CONFIG_IP_SCTP)		+= sctp/
 +obj-$(CONFIG_IEEE80211)		+= ieee80211/
  
  ifeq ($(CONFIG_NET),y)
  obj-$(CONFIG_SYSCTL)		+= sysctl_net.o