diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-12-22 20:57:02 +0300 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-12-22 20:57:02 +0300 |
| commit | 4b7bd364700d9ac8372eff48832062b936d0793b (patch) | |
| tree | 0dbf78c95456a0b02d07fcd473281f04a87e266d /include/net/dst_ops.h | |
| parent | c0d8768af260e2cbb4bf659ae6094a262c86b085 (diff) | |
| parent | 90a8a73c06cc32b609a880d48449d7083327e11a (diff) | |
| download | linux-4b7bd364700d9ac8372eff48832062b936d0793b.tar.xz | |
Merge branch 'master' into for-next
Conflicts:
MAINTAINERS
arch/arm/mach-omap2/pm24xx.c
drivers/scsi/bfa/bfa_fcpim.c
Needed to update to apply fixes for which the old branch was too
outdated.
Diffstat (limited to 'include/net/dst_ops.h')
| -rw-r--r-- | include/net/dst_ops.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/net/dst_ops.h b/include/net/dst_ops.h index 1fa5306e3e23..51665b3461b8 100644 --- a/include/net/dst_ops.h +++ b/include/net/dst_ops.h @@ -2,6 +2,7 @@ #define _NET_DST_OPS_H #include <linux/types.h> #include <linux/percpu_counter.h> +#include <linux/cache.h> struct dst_entry; struct kmem_cachep; |