From: Andrew Morton <akpm@osdl.org>

Cc: Rolf Eike Beer <eike-kernel@sf-tec.de>
Cc: Muli Ben-Yehuda <muli@il.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 arch/x86_64/kernel/pci-swiotlb.c |    3 ++-
 drivers/net/fec_8xx/fec_main.c   |    2 +-
 drivers/net/fs_enet/fs_enet.h    |    3 +--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff -puN arch/x86_64/kernel/pci-swiotlb.c~move-valid_dma_direction-from-x86_64-to-generic-code-fix arch/x86_64/kernel/pci-swiotlb.c
--- a/arch/x86_64/kernel/pci-swiotlb.c~move-valid_dma_direction-from-x86_64-to-generic-code-fix
+++ a/arch/x86_64/kernel/pci-swiotlb.c
@@ -3,7 +3,8 @@
 #include <linux/pci.h>
 #include <linux/cache.h>
 #include <linux/module.h>
-#include <asm/dma-mapping.h>
+#include <linux/dma-mapping.h>
+
 #include <asm/proto.h>
 #include <asm/swiotlb.h>
 #include <asm/dma.h>
diff -puN drivers/net/fec_8xx/fec_main.c~move-valid_dma_direction-from-x86_64-to-generic-code-fix drivers/net/fec_8xx/fec_main.c
--- a/drivers/net/fec_8xx/fec_main.c~move-valid_dma_direction-from-x86_64-to-generic-code-fix
+++ a/drivers/net/fec_8xx/fec_main.c
@@ -30,6 +30,7 @@
 #include <linux/mii.h>
 #include <linux/ethtool.h>
 #include <linux/bitops.h>
+#include <linux/dma-mapping.h>
 
 #include <asm/8xx_immap.h>
 #include <asm/pgtable.h>
@@ -37,7 +38,6 @@
 #include <asm/irq.h>
 #include <asm/uaccess.h>
 #include <asm/commproc.h>
-#include <asm/dma-mapping.h>
 
 #include "fec_8xx.h"
 
diff -puN drivers/net/fs_enet/fs_enet.h~move-valid_dma_direction-from-x86_64-to-generic-code-fix drivers/net/fs_enet/fs_enet.h
--- a/drivers/net/fs_enet/fs_enet.h~move-valid_dma_direction-from-x86_64-to-generic-code-fix
+++ a/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>
 
_