diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-08-30 19:32:29 +0200 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-08-30 19:32:29 +0200 |
| commit | ed735ccbefaf7e5e3ef61418f7e209b8c59308a7 (patch) | |
| tree | b8cc69814d2368b08d0a84c8da0c12028bd04867 /net/Makefile | |
| parent | /spare/repo/netdev-2.6 branch 'chelsio' (diff) | |
| parent | [INET]: compile errors when DEBUG is defined (diff) | |
| download | linux-ed735ccbefaf7e5e3ef61418f7e209b8c59308a7.tar.xz linux-ed735ccbefaf7e5e3ef61418f7e209b8c59308a7.zip | |
Merge HEAD from /spare/repo/linux-2.6/.git
Diffstat (limited to 'net/Makefile')
| -rw-r--r-- | net/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/Makefile b/net/Makefile index 8e2bdc025ab8..7e6eff206c81 100644 --- a/net/Makefile +++ b/net/Makefile @@ -16,6 +16,7 @@ obj-$(CONFIG_NET) += $(tmp-y) obj-$(CONFIG_LLC) += llc/ obj-$(CONFIG_NET) += ethernet/ 802/ sched/ netlink/ obj-$(CONFIG_INET) += ipv4/ +obj-$(CONFIG_NETFILTER) += netfilter/ obj-$(CONFIG_XFRM) += xfrm/ obj-$(CONFIG_UNIX) += unix/ ifneq ($(CONFIG_IPV6),) @@ -41,6 +42,7 @@ 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/ ifeq ($(CONFIG_NET),y) |