diff options
author | Jens Axboe <jens.axboe@oracle.com> | 2010-05-21 15:27:26 -0400 |
---|---|---|
committer | Jens Axboe <jens.axboe@oracle.com> | 2010-05-21 15:27:26 -0400 |
commit | ee9a3607fb03e804ddf624544105f4e34260c380 (patch) | |
tree | ce41b6e0fa10982a306f6c142a92dbf3c9961284 /net/sched/act_gact.c | |
parent | b492e95be0ae672922f4734acf3f5d35c30be948 (diff) | |
parent | d515e86e639890b33a09390d062b0831664f04a2 (diff) |
Merge branch 'master' into for-2.6.35
Conflicts:
fs/ext3/fsync.c
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'net/sched/act_gact.c')
-rw-r--r-- | net/sched/act_gact.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/sched/act_gact.c b/net/sched/act_gact.c index e7f796aec657..8406c6654990 100644 --- a/net/sched/act_gact.c +++ b/net/sched/act_gact.c | |||
@@ -202,9 +202,9 @@ MODULE_LICENSE("GPL"); | |||
202 | static int __init gact_init_module(void) | 202 | static int __init gact_init_module(void) |
203 | { | 203 | { |
204 | #ifdef CONFIG_GACT_PROB | 204 | #ifdef CONFIG_GACT_PROB |
205 | printk("GACT probability on\n"); | 205 | printk(KERN_INFO "GACT probability on\n"); |
206 | #else | 206 | #else |
207 | printk("GACT probability NOT on\n"); | 207 | printk(KERN_INFO "GACT probability NOT on\n"); |
208 | #endif | 208 | #endif |
209 | return tcf_register_action(&act_gact_ops); | 209 | return tcf_register_action(&act_gact_ops); |
210 | } | 210 | } |