diff options
| author | Ingo Molnar | 2008-10-24 12:48:46 +0200 |
|---|---|---|
| committer | Ingo Molnar | 2008-10-24 12:48:46 +0200 |
| commit | 8c82a17e9c924c0e9f13e75e4c2f6bca19a4b516 (patch) | |
| tree | d535f46a917e14e90deccb29ad00aac016ad18dd /net/netfilter/nfnetlink.c | |
| parent | sched: add CONFIG_SMP consistency (diff) | |
| parent | Linux 2.6.28-rc1 (diff) | |
| download | kernel-qcow2-linux-8c82a17e9c924c0e9f13e75e4c2f6bca19a4b516.tar.gz kernel-qcow2-linux-8c82a17e9c924c0e9f13e75e4c2f6bca19a4b516.tar.xz kernel-qcow2-linux-8c82a17e9c924c0e9f13e75e4c2f6bca19a4b516.zip | |
Merge commit 'v2.6.28-rc1' into sched/urgent
Diffstat (limited to 'net/netfilter/nfnetlink.c')
| -rw-r--r-- | net/netfilter/nfnetlink.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netfilter/nfnetlink.c b/net/netfilter/nfnetlink.c index 4739f9f961d8..9c0ba17a1ddb 100644 --- a/net/netfilter/nfnetlink.c +++ b/net/netfilter/nfnetlink.c @@ -137,7 +137,7 @@ static int nfnetlink_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh) replay: ss = nfnetlink_get_subsys(type); if (!ss) { -#ifdef CONFIG_KMOD +#ifdef CONFIG_MODULES nfnl_unlock(); request_module("nfnetlink-subsys-%d", NFNL_SUBSYS_ID(type)); nfnl_lock(); |