Merge branches 'pm-cpuidle' and 'pm-em'

[linux-2.6-microblaze.git] / net / sched / sch_blackhole.c

diff --git a/net/sched/sch_blackhole.c b/net/sched/sch_blackhole.c
index 1876446..a7f7667 100644 (file)
--- a/net/sched/sch_blackhole.c
+++ b/net/sched/sch_blackhole.c
@@ -13,7 +13,7 @@
 #include <linux/skbuff.h>
 #include <net/pkt_sched.h>
 
-static int blackhole_enqueue(struct sk_buff *skb, struct Qdisc *sch, spinlock_t *root_lock,
+static int blackhole_enqueue(struct sk_buff *skb, struct Qdisc *sch,
                             struct sk_buff **to_free)
 {
        qdisc_drop(skb, sch, to_free);