diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-06 18:23:56 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-06 18:23:56 -0500 |
| commit | 57d1c91fa6d9146b309b7511f6432dea2a24858b (patch) | |
| tree | d7958dd87eb950cc3eeaf8b32fc372c0e7ff6702 /net | |
| parent | 47853e7fa588bef826c9799a87b33904b32bd905 (diff) | |
| parent | 37193147991a53b2e9f573d0ec47f63a2d4de8dc (diff) | |
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) | |||
| 171 | /* Prior to 2.6.11, we had a ports param. No longer, but don't break users. */ | 171 | /* Prior to 2.6.11, we had a ports param. No longer, but don't break users. */ |
| 172 | static int warn_set(const char *val, struct kernel_param *kp) | 172 | static int warn_set(const char *val, struct kernel_param *kp) |
| 173 | { | 173 | { |
| 174 | printk(KERN_INFO __stringify(KBUILD_MODNAME) | 174 | printk(KERN_INFO KBUILD_MODNAME |
| 175 | ": kernel >= 2.6.10 only uses 'ports' for conntrack modules\n"); | 175 | ": kernel >= 2.6.10 only uses 'ports' for conntrack modules\n"); |
| 176 | return 0; | 176 | return 0; |
| 177 | } | 177 | } |
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) | |||
| 113 | /* Prior to 2.6.11, we had a ports param. No longer, but don't break users. */ | 113 | /* Prior to 2.6.11, we had a ports param. No longer, but don't break users. */ |
| 114 | static int warn_set(const char *val, struct kernel_param *kp) | 114 | static int warn_set(const char *val, struct kernel_param *kp) |
| 115 | { | 115 | { |
| 116 | printk(KERN_INFO __stringify(KBUILD_MODNAME) | 116 | printk(KERN_INFO KBUILD_MODNAME |
| 117 | ": kernel >= 2.6.10 only uses 'ports' for conntrack modules\n"); | 117 | ": kernel >= 2.6.10 only uses 'ports' for conntrack modules\n"); |
| 118 | return 0; | 118 | return 0; |
| 119 | } | 119 | } |