git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb
[sfrench/cifs-2.6.git]
/
drivers
/
net
/
fs_enet
/
fs_enet.h
diff --git
a/drivers/net/fs_enet/fs_enet.h
b/drivers/net/fs_enet/fs_enet.h
index 95022c005f75cb3497f269476b00657e87b4c493..92590d8fc24b4ee39b9e7bf7175132d5fa5a9002 100644
(file)
--- a/
drivers/net/fs_enet/fs_enet.h
+++ b/
drivers/net/fs_enet/fs_enet.h
@@
-6,11
+6,10
@@
#include <linux/types.h>
#include <linux/list.h>
#include <linux/phy.h>
+#include <linux/dma-mapping.h>
#include <linux/fs_enet_pd.h>
-#include <asm/dma-mapping.h>
-
#ifdef CONFIG_CPM1
#include <asm/commproc.h>