git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm
[safe/jmp/linux-2.6]
/
drivers
/
char
/
cyclades.c
diff --git
a/drivers/char/cyclades.c
b/drivers/char/cyclades.c
index
b861c08
..
9824b41
100644
(file)
--- a/
drivers/char/cyclades.c
+++ b/
drivers/char/cyclades.c
@@
-79,6
+79,7
@@
#include <linux/bitops.h>
#include <linux/firmware.h>
#include <linux/device.h>
+#include <linux/slab.h>
#include <linux/io.h>
#include <linux/uaccess.h>