Merge HEAD from master.kernel.org:/home/rmk/linux-2.6-arm

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

diff --git a/net/netfilter/Makefile b/net/netfilter/Makefile
index 02e67d37194168abd84107fe5f417b8f937babdb..b3b44f8b415a6f1ea495a82d137833d3b7f9ee6f 100644 (file)
--- a/net/netfilter/Makefile
+++ b/net/netfilter/Makefile
@@ -1 +1,7 @@
+netfilter-objs := core.o nf_log.o nf_queue.o nf_sockopt.o
+
+obj-$(CONFIG_NETFILTER) = netfilter.o
+
 obj-$(CONFIG_NETFILTER_NETLINK) += nfnetlink.o
+obj-$(CONFIG_NETFILTER_NETLINK_QUEUE) += nfnetlink_queue.o
+obj-$(CONFIG_NETFILTER_NETLINK_LOG) += nfnetlink_log.o