summaryrefslogtreecommitdiffstats
path: root/drivers/net/mac89x0.c
diff options
context:
space:
mode:
authorAnton Vorontsov <cbouatmailru@gmail.com>2010-04-26 21:56:19 +0400
committerAnton Vorontsov <cbouatmailru@gmail.com>2010-04-26 21:56:19 +0400
commit8ef1bb539203629f77a61976e4f25415e1083bff (patch)
tree4fee25aca0928f112716fb02d27b1b355d0843b4 /drivers/net/mac89x0.c
parenta3bcbbee83f55cbaec9b2ad748e7300c7feb2192 (diff)
parentb91ce4d14a21fc04d165be30319541e0f9204f15 (diff)
downloadlinux-8ef1bb539203629f77a61976e4f25415e1083bff.tar.gz
linux-8ef1bb539203629f77a61976e4f25415e1083bff.tar.bz2
linux-8ef1bb539203629f77a61976e4f25415e1083bff.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/net/mac89x0.c')
-rw-r--r--drivers/net/mac89x0.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/mac89x0.c b/drivers/net/mac89x0.c
index c292a608f9a9..c0876e915eed 100644
--- a/drivers/net/mac89x0.c
+++ b/drivers/net/mac89x0.c
@@ -88,7 +88,6 @@ static char *version =
#include <linux/interrupt.h>
#include <linux/ioport.h>
#include <linux/in.h>
-#include <linux/slab.h>
#include <linux/string.h>
#include <linux/nubus.h>
#include <linux/errno.h>
@@ -98,6 +97,7 @@ static char *version =
#include <linux/skbuff.h>
#include <linux/delay.h>
#include <linux/bitops.h>
+#include <linux/gfp.h>
#include <asm/system.h>
#include <asm/io.h>