summaryrefslogtreecommitdiffstats
path: root/drivers/net/can/softing
diff options
context:
space:
mode:
authorAlexey Dobriyan <adobriyan@gmail.com>2011-06-16 11:01:34 +0000
committerDavid S. Miller <davem@davemloft.net>2011-06-21 19:17:20 -0700
commitb7f080cfe223b3b7424872639d153695615a9255 (patch)
tree605390854789a6ba53e6813ffc69a948a0466530 /drivers/net/can/softing
parent4003b65871c101eb5ce8f37a325feac54aa5c681 (diff)
downloadlinux-stable-b7f080cfe223b3b7424872639d153695615a9255.tar.gz
linux-stable-b7f080cfe223b3b7424872639d153695615a9255.tar.bz2
linux-stable-b7f080cfe223b3b7424872639d153695615a9255.zip
net: remove mm.h inclusion from netdevice.h
Remove linux/mm.h inclusion from netdevice.h -- it's unused (I've checked manually). To prevent mm.h inclusion via other channels also extract "enum dma_data_direction" definition into separate header. This tiny piece is what gluing netdevice.h with mm.h via "netdevice.h => dmaengine.h => dma-mapping.h => scatterlist.h => mm.h". Removal of mm.h from scatterlist.h was tried and was found not feasible on most archs, so the link was cutoff earlier. Hope people are OK with tiny include file. Note, that mm_types.h is still dragged in, but it is a separate story. Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/can/softing')
-rw-r--r--drivers/net/can/softing/softing_fw.c1
-rw-r--r--drivers/net/can/softing/softing_main.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/can/softing/softing_fw.c b/drivers/net/can/softing/softing_fw.c
index b520784fb197..310596175676 100644
--- a/drivers/net/can/softing/softing_fw.c
+++ b/drivers/net/can/softing/softing_fw.c
@@ -20,6 +20,7 @@
#include <linux/firmware.h>
#include <linux/sched.h>
#include <asm/div64.h>
+#include <asm/io.h>
#include "softing.h"
diff --git a/drivers/net/can/softing/softing_main.c b/drivers/net/can/softing/softing_main.c
index 60a49e5a2a53..954b2959b6b2 100644
--- a/drivers/net/can/softing/softing_main.c
+++ b/drivers/net/can/softing/softing_main.c
@@ -21,6 +21,7 @@
#include <linux/module.h>
#include <linux/init.h>
#include <linux/interrupt.h>
+#include <asm/io.h>
#include "softing.h"