projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-2.6.22' of git://git.kernel.dk/data/git/linux-2.6-block
[powerpc.git]
/
net
/
bridge
/
br_stp_timer.c
diff --git
a/net/bridge/br_stp_timer.c
b/net/bridge/br_stp_timer.c
index
030aa79
..
24e0ca4
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"