diff options
| author | Jens Axboe <jens.axboe@oracle.com> | 2010-04-13 14:03:21 -0400 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2010-04-13 14:03:21 -0400 |
| commit | 4facdaec1ce186e731e6baa04f074804849e9a49 (patch) | |
| tree | e521fba8386bf23533cfe21ea5200e615960ec07 /net/sched/ematch.c | |
| parent | a11cdaa7af56423a921a8bdad8f5a5f4ddca918a (diff) | |
| parent | 0d0fb0f9c5fddef4a10242fe3337f00f528a3099 (diff) | |
Merge branch 'master' into for-2.6.35
Conflicts:
block/blk-cgroup.c
block/cfq-iosched.c
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'net/sched/ematch.c')
| -rw-r--r-- | net/sched/ematch.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/sched/ematch.c b/net/sched/ematch.c index aab59409728b..e782bdeedc58 100644 --- a/net/sched/ematch.c +++ b/net/sched/ematch.c | |||
| @@ -82,6 +82,7 @@ | |||
| 82 | */ | 82 | */ |
| 83 | 83 | ||
| 84 | #include <linux/module.h> | 84 | #include <linux/module.h> |
| 85 | #include <linux/slab.h> | ||
| 85 | #include <linux/types.h> | 86 | #include <linux/types.h> |
| 86 | #include <linux/kernel.h> | 87 | #include <linux/kernel.h> |
| 87 | #include <linux/errno.h> | 88 | #include <linux/errno.h> |