summaryrefslogtreecommitdiffstats
path: root/drivers/net/sunhme.c
diff options
context:
space:
mode:
authorLinus Torvalds2006-12-04 19:37:06 +0100
committerLinus Torvalds2006-12-04 19:37:06 +0100
commit9b8ab9f6c37c610feea20edfb357a3b8a43d39bd (patch)
tree02d18c920a03a600e915d66d6a471d900857b3ac /drivers/net/sunhme.c
parentMerge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 (diff)
parent[PATCH] severing poll.h -> mm.h (diff)
downloadkernel-qcow2-linux-9b8ab9f6c37c610feea20edfb357a3b8a43d39bd.tar.gz
kernel-qcow2-linux-9b8ab9f6c37c610feea20edfb357a3b8a43d39bd.tar.xz
kernel-qcow2-linux-9b8ab9f6c37c610feea20edfb357a3b8a43d39bd.zip
Merge branch 'for-linus4' of master.kernel.org:/pub/scm/linux/kernel/git/viro/bird
* 'for-linus4' of master.kernel.org:/pub/scm/linux/kernel/git/viro/bird: [PATCH] severing poll.h -> mm.h [PATCH] severing skbuff.h -> mm.h [PATCH] severing skbuff.h -> poll.h [PATCH] severing skbuff.h -> highmem.h [PATCH] severing uaccess.h -> sched.h [PATCH] severing fs.h, radix-tree.h -> sched.h [PATCH] severing module.h->sched.h
Diffstat (limited to 'drivers/net/sunhme.c')
-rw-r--r--drivers/net/sunhme.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/sunhme.c b/drivers/net/sunhme.c
index df40e34c7766..ef671739cfea 100644
--- a/drivers/net/sunhme.c
+++ b/drivers/net/sunhme.c
@@ -32,6 +32,7 @@
#include <linux/netdevice.h>
#include <linux/etherdevice.h>
#include <linux/skbuff.h>
+#include <linux/mm.h>
#include <linux/bitops.h>
#include <asm/system.h>