diff options
author | Rolf Eike Beer <eike-kernel@sf-tec.de> | 2006-09-29 04:59:48 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-29 12:18:10 -0400 |
commit | d6bd3a39f7c6ebad49c261c3d458df974c880758 (patch) | |
tree | a5cf6054a8ff276f8d84ba94bb5df89ed5646332 /drivers | |
parent | d09d7ddf3018b4c6efa76dce72f6dec6054fa22b (diff) |
[PATCH] Move valid_dma_direction() from x86_64 to generic code
As suggested by Muli Ben-Yehuda this function is moved to generic code as
may be useful for all archs.
[akpm@osdl.org: fix]
Signed-off-by: Rolf Eike Beer <eike-kernel@sf-tec.de>
Cc: Muli Ben-Yehuda <muli@il.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/fec_8xx/fec_main.c | 2 | ||||
-rw-r--r-- | drivers/net/fs_enet/fs_enet.h | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/fec_8xx/fec_main.c b/drivers/net/fec_8xx/fec_main.c index 22ac2df1aeb0..e17a1449ee10 100644 --- a/drivers/net/fec_8xx/fec_main.c +++ b/drivers/net/fec_8xx/fec_main.c | |||
@@ -30,6 +30,7 @@ | |||
30 | #include <linux/mii.h> | 30 | #include <linux/mii.h> |
31 | #include <linux/ethtool.h> | 31 | #include <linux/ethtool.h> |
32 | #include <linux/bitops.h> | 32 | #include <linux/bitops.h> |
33 | #include <linux/dma-mapping.h> | ||
33 | 34 | ||
34 | #include <asm/8xx_immap.h> | 35 | #include <asm/8xx_immap.h> |
35 | #include <asm/pgtable.h> | 36 | #include <asm/pgtable.h> |
@@ -37,7 +38,6 @@ | |||
37 | #include <asm/irq.h> | 38 | #include <asm/irq.h> |
38 | #include <asm/uaccess.h> | 39 | #include <asm/uaccess.h> |
39 | #include <asm/commproc.h> | 40 | #include <asm/commproc.h> |
40 | #include <asm/dma-mapping.h> | ||
41 | 41 | ||
42 | #include "fec_8xx.h" | 42 | #include "fec_8xx.h" |
43 | 43 | ||
diff --git a/drivers/net/fs_enet/fs_enet.h b/drivers/net/fs_enet/fs_enet.h index 95022c005f75..92590d8fc24b 100644 --- a/drivers/net/fs_enet/fs_enet.h +++ b/drivers/net/fs_enet/fs_enet.h | |||
@@ -6,11 +6,10 @@ | |||
6 | #include <linux/types.h> | 6 | #include <linux/types.h> |
7 | #include <linux/list.h> | 7 | #include <linux/list.h> |
8 | #include <linux/phy.h> | 8 | #include <linux/phy.h> |
9 | #include <linux/dma-mapping.h> | ||
9 | 10 | ||
10 | #include <linux/fs_enet_pd.h> | 11 | #include <linux/fs_enet_pd.h> |
11 | 12 | ||
12 | #include <asm/dma-mapping.h> | ||
13 | |||
14 | #ifdef CONFIG_CPM1 | 13 | #ifdef CONFIG_CPM1 |
15 | #include <asm/commproc.h> | 14 | #include <asm/commproc.h> |
16 | 15 | ||