diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-21 15:45:19 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-21 15:45:19 -0700 |
| commit | 4a4f8fdba6f5a34ca90f426021e17491a30202da (patch) | |
| tree | 6eb8be6c9542845321252b1d64394a2c2ea84dd0 /net/ipv4/Makefile | |
| parent | 2c6e5a839f92591a4bc6cac4a575d42151645af3 (diff) | |
| parent | 90f66914c89b0be63548d4387d1211280aa7bc8e (diff) | |
| download | linux-4a4f8fdba6f5a34ca90f426021e17491a30202da.tar.gz linux-4a4f8fdba6f5a34ca90f426021e17491a30202da.tar.bz2 linux-4a4f8fdba6f5a34ca90f426021e17491a30202da.zip | |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/ipv4/Makefile')
| -rw-r--r-- | net/ipv4/Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/ipv4/Makefile b/net/ipv4/Makefile index 8b379627ebb6..65d57d8e1add 100644 --- a/net/ipv4/Makefile +++ b/net/ipv4/Makefile @@ -7,8 +7,10 @@ obj-y := utils.o route.o inetpeer.o protocol.o \ ip_output.o ip_sockglue.o \ tcp.o tcp_input.o tcp_output.o tcp_timer.o tcp_ipv4.o tcp_minisocks.o \ datagram.o raw.o udp.o arp.o icmp.o devinet.o af_inet.o igmp.o \ - sysctl_net_ipv4.o fib_frontend.o fib_semantics.o fib_hash.o + sysctl_net_ipv4.o fib_frontend.o fib_semantics.o +obj-$(CONFIG_IP_FIB_HASH) += fib_hash.o +obj-$(CONFIG_IP_FIB_TRIE) += fib_trie.o obj-$(CONFIG_PROC_FS) += proc.o obj-$(CONFIG_IP_MULTIPLE_TABLES) += fib_rules.o obj-$(CONFIG_IP_MROUTE) += ipmr.o |