git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'fix/hda' into for-linus
[pandora-kernel.git]
/
drivers
/
block
/
aoe
/
aoedev.c
diff --git
a/drivers/block/aoe/aoedev.c
b/drivers/block/aoe/aoedev.c
index
fa67027
..
0849280
100644
(file)
--- a/
drivers/block/aoe/aoedev.c
+++ b/
drivers/block/aoe/aoedev.c
@@
-8,6
+8,7
@@
#include <linux/blkdev.h>
#include <linux/netdevice.h>
#include <linux/delay.h>
+#include <linux/slab.h>
#include "aoe.h"
static void dummy_timer(ulong);