diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-05-31 11:07:15 +0100 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-05-31 11:07:15 +0100 |
commit | e37c83c06c2690157a989df40dc99a6b61c9ea15 (patch) | |
tree | 024dfb8b2c9abeec9ca7cb0c0136c276d9aacc91 /include/net/netlabel.h | |
parent | ce1f7d30766f6549db6fa0b9e595e0d26a5b7d9a (diff) | |
parent | 67a3e12b05e055c0415c556a315a3d3eb637e29e (diff) | |
download | kernel_samsung_tuna-e37c83c06c2690157a989df40dc99a6b61c9ea15.zip kernel_samsung_tuna-e37c83c06c2690157a989df40dc99a6b61c9ea15.tar.gz kernel_samsung_tuna-e37c83c06c2690157a989df40dc99a6b61c9ea15.tar.bz2 |
Merge commit 'v2.6.35-rc1' into for-2.6.36
Diffstat (limited to 'include/net/netlabel.h')
-rw-r--r-- | include/net/netlabel.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/net/netlabel.h b/include/net/netlabel.h index 60ebbc1..9db401a 100644 --- a/include/net/netlabel.h +++ b/include/net/netlabel.h @@ -31,6 +31,7 @@ #define _NETLABEL_H #include <linux/types.h> +#include <linux/slab.h> #include <linux/net.h> #include <linux/skbuff.h> #include <linux/in.h> |