diff options
| author | Linus Torvalds | 2006-01-07 00:23:56 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2006-01-07 00:23:56 +0100 |
| commit | 57d1c91fa6d9146b309b7511f6432dea2a24858b (patch) | |
| tree | d7958dd87eb950cc3eeaf8b32fc372c0e7ff6702 /net | |
| parent | Merge git://git.linux-nfs.org/pub/linux/nfs-2.6 (diff) | |
| parent | kconfig: fix gconfig with POSIXLY_CORRECT=1 (diff) | |
| download | kernel-qcow2-linux-57d1c91fa6d9146b309b7511f6432dea2a24858b.tar.gz kernel-qcow2-linux-57d1c91fa6d9146b309b7511f6432dea2a24858b.tar.xz kernel-qcow2-linux-57d1c91fa6d9146b309b7511f6432dea2a24858b.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv4/netfilter/ip_nat_ftp.c | 2 | ||||
| -rw-r--r-- | net/ipv4/netfilter/ip_nat_irc.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/netfilter/ip_nat_ftp.c b/net/ipv4/netfilter/ip_nat_ftp.c index d83757a70d9f..b8daab3c64af 100644 --- a/net/ipv4/netfilter/ip_nat_ftp.c +++ b/net/ipv4/netfilter/ip_nat_ftp.c @@ -171,7 +171,7 @@ static int __init init(void) /* Prior to 2.6.11, we had a ports param. No longer, but don't break users. */ static int warn_set(const char *val, struct kernel_param *kp) { - printk(KERN_INFO __stringify(KBUILD_MODNAME) + printk(KERN_INFO KBUILD_MODNAME ": kernel >= 2.6.10 only uses 'ports' for conntrack modules\n"); return 0; } diff --git a/net/ipv4/netfilter/ip_nat_irc.c b/net/ipv4/netfilter/ip_nat_irc.c index de31942babe3..461c833eaca1 100644 --- a/net/ipv4/netfilter/ip_nat_irc.c +++ b/net/ipv4/netfilter/ip_nat_irc.c @@ -113,7 +113,7 @@ static int __init init(void) /* Prior to 2.6.11, we had a ports param. No longer, but don't break users. */ static int warn_set(const char *val, struct kernel_param *kp) { - printk(KERN_INFO __stringify(KBUILD_MODNAME) + printk(KERN_INFO KBUILD_MODNAME ": kernel >= 2.6.10 only uses 'ports' for conntrack modules\n"); return 0; } |