Pull thermal into release branch

[linux-2.6] / net / bridge / br_stp_timer.c

diff --git a/net/bridge/br_stp_timer.c b/net/bridge/br_stp_timer.c
index 030aa798fea70bd5b9ee4a6fc814529c569e460b..24e0ca4a3131948af3cf2d59c956ccf9f852fc96 100644 (file)
--- a/net/bridge/br_stp_timer.c
+++ b/net/bridge/br_stp_timer.c
@@ -15,7 +15,6 @@
 
 #include <linux/kernel.h>
 #include <linux/times.h>
-#include <linux/smp_lock.h>
 
 #include "br_private.h"
 #include "br_private_stp.h"