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 'drm-ttm-unmappable' into drm-core-next
[pandora-kernel.git]
/
drivers
/
staging
/
comedi
/
drivers
/
comedi_bond.c
diff --git
a/drivers/staging/comedi/drivers/comedi_bond.c
b/drivers/staging/comedi/drivers/comedi_bond.c
index
d7260cc
..
41311d9
100644
(file)
--- a/
drivers/staging/comedi/drivers/comedi_bond.c
+++ b/
drivers/staging/comedi/drivers/comedi_bond.c
@@
-90,6
+90,7
@@
Configuration Options:
#include "../comedilib.h"
#include "../comedidev.h"
#include <linux/string.h>
+#include <linux/slab.h>
/* The maxiumum number of channels per subdevice. */
#define MAX_CHANS 256