Merge nuts.ninka.net:/disk1/davem/BK/network-2.5

into nuts.ninka.net:/disk1/davem/BK/net-2.5

net/llc/llc_output.c

@@ -16,6 +16,7 @@
 #include <linux/if_arp.h>
 #include <linux/if_tr.h>
 #include <linux/netdevice.h>
+#include <linux/trdevice.h>
 #include <linux/skbuff.h>
 #include <net/llc.h>
 #include <net/llc_pdu.h>

net/sched/sch_generic.c

@@ -416,7 +416,6 @@ void qdisc_destroy(struct Qdisc *qdisc)
 
 	dev = qdisc->dev;
 
-#ifdef CONFIG_NET_SCHED
 	if (dev) {
 		struct Qdisc *q, **qp;
 		for (qp = &qdisc->dev->qdisc_list; (q=*qp) != NULL; qp = &q->next) {
@@ -428,7 +427,6 @@ void qdisc_destroy(struct Qdisc *qdisc)
 	}
 #ifdef CONFIG_NET_ESTIMATOR
 	qdisc_kill_estimator(&qdisc->stats);
-#endif
 #endif
 	if (ops->reset)
 		ops->reset(qdisc);