summaryrefslogtreecommitdiff
path: root/net/llc/llc_conn.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2010-04-16 15:20:06 +0200
committerTakashi Iwai <tiwai@suse.de>2010-04-16 15:20:06 +0200
commitcf0dbba515415bb19b11f9323d5f7bebd7f24fd6 (patch)
tree375bbc1ade1a92acd6493d224dd701fd7f209014 /net/llc/llc_conn.c
parent1cff399ecd9125d8e6a634a1957be1aeb3195a12 (diff)
parent0340c7dccd80d8706c636e030a6ebbddbddca690 (diff)
Merge remote branch 'alsa/devel' into topic/misc
Diffstat (limited to 'net/llc/llc_conn.c')
-rw-r--r--net/llc/llc_conn.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/llc/llc_conn.c b/net/llc/llc_conn.c
index a12144da7974..ba137a6a224d 100644
--- a/net/llc/llc_conn.c
+++ b/net/llc/llc_conn.c
@@ -13,6 +13,7 @@
*/
#include <linux/init.h>
+#include <linux/slab.h>
#include <net/llc_sap.h>
#include <net/llc_conn.h>
#include <net/sock.h>