projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'bkl/procfs' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic...
[linux-2.6-block.git]
/
drivers
/
net
/
arm
/
ixp4xx_eth.c
diff --git
a/drivers/net/arm/ixp4xx_eth.c
b/drivers/net/arm/ixp4xx_eth.c
index 6e2ae1d06df16c54b6aaaf129c3b8a339fb42315..6be8b098b8b48b58be55df6aaf529dabee07decc 100644
(file)
--- a/
drivers/net/arm/ixp4xx_eth.c
+++ b/
drivers/net/arm/ixp4xx_eth.c
@@
-32,6
+32,7
@@
#include <linux/kernel.h>
#include <linux/phy.h>
#include <linux/platform_device.h>
+#include <linux/slab.h>
#include <mach/npe.h>
#include <mach/qmgr.h>