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
/
serial
/
max3100.c
diff --git
a/drivers/serial/max3100.c
b/drivers/serial/max3100.c
index
3c30c56
..
3351c3b
100644
(file)
--- a/
drivers/serial/max3100.c
+++ b/
drivers/serial/max3100.c
@@
-41,6
+41,7
@@
#define MAX_MAX3100 4
#include <linux/delay.h>
+#include <linux/slab.h>
#include <linux/device.h>
#include <linux/serial_core.h>
#include <linux/serial.h>