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
/
ni_labpc_cs.c
diff --git
a/drivers/staging/comedi/drivers/ni_labpc_cs.c
b/drivers/staging/comedi/drivers/ni_labpc_cs.c
index
0b963bb
..
8ad1055
100644
(file)
--- a/
drivers/staging/comedi/drivers/ni_labpc_cs.c
+++ b/
drivers/staging/comedi/drivers/ni_labpc_cs.c
@@
-64,6
+64,7
@@
NI manuals:
#include "../comedidev.h"
#include <linux/delay.h>
+#include <linux/slab.h>
#include "8253.h"
#include "8255.h"