Merge master.kernel.org:/home/rmk/linux-2.6-serial

[linux-2.6] / net / sched / em_text.c

diff --git a/net/sched/em_text.c b/net/sched/em_text.c
index 873840d8d0727f8da965498439a30619093e197a..77beabc91fa37107d662bd837a448a3d23cb944f 100644 (file)
--- a/net/sched/em_text.c
+++ b/net/sched/em_text.c
@@ -55,9 +55,6 @@ static int em_text_change(struct tcf_proto *tp, void *data, int len,
        struct ts_config *ts_conf;
        int flags = 0;
 
-       printk("Configuring text: %s from %d:%d to %d:%d len %d\n", conf->algo, conf->from_offset,
-           conf->from_layer, conf->to_offset, conf->to_layer, conf->pattern_len);
-
        if (len < sizeof(*conf) || len < (sizeof(*conf) + conf->pattern_len))
                return -EINVAL;