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 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[safe/jmp/linux-2.6]
/
drivers
/
net
/
fec_mpc52xx.c
diff --git
a/drivers/net/fec_mpc52xx.c
b/drivers/net/fec_mpc52xx.c
index
667ba13
..
0376c3e
100644
(file)
--- a/
drivers/net/fec_mpc52xx.c
+++ b/
drivers/net/fec_mpc52xx.c
@@
-19,6
+19,7
@@
#include <linux/kernel.h>
#include <linux/types.h>
#include <linux/spinlock.h>
+#include <linux/slab.h>
#include <linux/errno.h>
#include <linux/init.h>
#include <linux/crc32.h>