diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2011-11-13 19:55:35 (GMT) |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2011-11-13 19:55:53 (GMT) |
| commit | 2290c0d06d82faee87b1ab2d9d4f7bf81ef64379 (patch) | |
| tree | e075e4d5534193f28e6059904f61e5ca03958d3c /net/bridge/br_stp_if.c | |
| parent | 4da669a2e3e5bc70b30a0465f3641528681b5f77 (diff) | |
| parent | 52e4c2a05256cb83cda12f3c2137ab1533344edb (diff) | |
| download | linux-fsl-qoriq-2290c0d06d82faee87b1ab2d9d4f7bf81ef64379.tar.xz | |
Merge branch 'master' into for-next
Sync with Linus tree to have 157550ff ("mtd: add GPMI-NAND driver
in the config and Makefile") as I have patch depending on that one.
Diffstat (limited to 'net/bridge/br_stp_if.c')
| -rw-r--r-- | net/bridge/br_stp_if.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/bridge/br_stp_if.c b/net/bridge/br_stp_if.c index 10eda3c..19308e3 100644 --- a/net/bridge/br_stp_if.c +++ b/net/bridge/br_stp_if.c @@ -12,6 +12,7 @@ */ #include <linux/kernel.h> +#include <linux/kmod.h> #include <linux/etherdevice.h> #include <linux/rtnetlink.h> |