summaryrefslogtreecommitdiffstats
path: root/drivers/net/mvme147.c
diff options
context:
space:
mode:
authorDan Williams <dan.j.williams@intel.com>2010-05-17 16:30:58 -0700
committerDan Williams <dan.j.williams@intel.com>2010-05-17 16:30:58 -0700
commit0b28330e39bbe0ffee4c56b09fc415fcec595ea3 (patch)
treefcf504879883763557e696eff81427b1ab78f76b /drivers/net/mvme147.c
parent058276303dbc4ed089c1f7dad0871810b1f5ddf1 (diff)
parentcaa20d974c86af496b419eef70010e63b7fab7ac (diff)
downloadop-kernel-dev-0b28330e39bbe0ffee4c56b09fc415fcec595ea3.zip
op-kernel-dev-0b28330e39bbe0ffee4c56b09fc415fcec595ea3.tar.gz
Merge branch 'ioat' into dmaengine
Diffstat (limited to 'drivers/net/mvme147.c')
-rw-r--r--drivers/net/mvme147.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/mvme147.c b/drivers/net/mvme147.c
index 93c709d..3a7ad84 100644
--- a/drivers/net/mvme147.c
+++ b/drivers/net/mvme147.c
@@ -10,11 +10,11 @@
#include <linux/types.h>
#include <linux/interrupt.h>
#include <linux/ioport.h>
-#include <linux/slab.h>
#include <linux/string.h>
#include <linux/delay.h>
#include <linux/init.h>
#include <linux/errno.h>
+#include <linux/gfp.h>
/* Used for the temporal inet entries and routing */
#include <linux/socket.h>
#include <linux/route.h>
OpenPOWER on IntegriCloud