diff options
| author | David S. Miller | 2008-07-18 11:39:39 +0200 |
|---|---|---|
| committer | David S. Miller | 2008-07-18 11:39:39 +0200 |
| commit | 49997d75152b3d23c53b0fa730599f2f74c92c65 (patch) | |
| tree | 46e93126170d02cfec9505172e545732c1b69656 /net/bridge/br_fdb.c | |
| parent | pkt_sched: Make default qdisc nonshared-multiqueue safe. (diff) | |
| parent | Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| download | kernel-qcow2-linux-49997d75152b3d23c53b0fa730599f2f74c92c65.tar.gz kernel-qcow2-linux-49997d75152b3d23c53b0fa730599f2f74c92c65.tar.xz kernel-qcow2-linux-49997d75152b3d23c53b0fa730599f2f74c92c65.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
Documentation/powerpc/booting-without-of.txt
drivers/atm/Makefile
drivers/net/fs_enet/fs_enet-main.c
drivers/pci/pci-acpi.c
net/8021q/vlan.c
net/iucv/iucv.c
Diffstat (limited to 'net/bridge/br_fdb.c')
| -rw-r--r-- | net/bridge/br_fdb.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/bridge/br_fdb.c b/net/bridge/br_fdb.c index 4de74cdd091d..a48f5efdb6bf 100644 --- a/net/bridge/br_fdb.c +++ b/net/bridge/br_fdb.c @@ -13,6 +13,7 @@ #include <linux/kernel.h> #include <linux/init.h> +#include <linux/rculist.h> #include <linux/spinlock.h> #include <linux/times.h> #include <linux/netdevice.h> |