Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6-omap-h63xx.git] / net / sched / Makefile

diff --git a/net/sched/Makefile b/net/sched/Makefile
index 020767a204d4495f50cd2e47e5b9830b1b851e91..81ecbe8e7dce66d85d239857c9ee981cf886d3af 100644 (file)
--- a/net/sched/Makefile
+++ b/net/sched/Makefile
@@ -8,10 +8,10 @@ obj-$(CONFIG_NET_SCHED)               += sch_api.o sch_blackhole.o
 obj-$(CONFIG_NET_CLS)          += cls_api.o
 obj-$(CONFIG_NET_CLS_ACT)      += act_api.o
 obj-$(CONFIG_NET_ACT_POLICE)   += act_police.o
-obj-$(CONFIG_NET_CLS_POLICE)   += act_police.o
 obj-$(CONFIG_NET_ACT_GACT)     += act_gact.o
 obj-$(CONFIG_NET_ACT_MIRRED)   += act_mirred.o
 obj-$(CONFIG_NET_ACT_IPT)      += act_ipt.o
+obj-$(CONFIG_NET_ACT_NAT)      += act_nat.o
 obj-$(CONFIG_NET_ACT_PEDIT)    += act_pedit.o
 obj-$(CONFIG_NET_ACT_SIMP)     += act_simple.o
 obj-$(CONFIG_NET_SCH_FIFO)     += sch_fifo.o