Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 25-akpm/arch/x86_64/mm/init.c        |    1 +
 25-akpm/include/asm-x86_64/swiotlb.h |    2 ++
 2 files changed, 3 insertions(+)

diff -puN arch/x86_64/mm/init.c~x86-64-merge-for-268rc2-mm1-fix arch/x86_64/mm/init.c
--- 25/arch/x86_64/mm/init.c~x86-64-merge-for-268rc2-mm1-fix	2004-08-05 02:08:50.876267208 -0700
+++ 25-akpm/arch/x86_64/mm/init.c	2004-08-05 02:09:01.681624544 -0700
@@ -36,6 +36,7 @@
 #include <asm/mmu_context.h>
 #include <asm/proto.h>
 #include <asm/smp.h>
+#include <asm/swiotlb.h>
 
 #ifndef Dprintk
 #define Dprintk(x...)
diff -puN include/asm-x86_64/swiotlb.h~x86-64-merge-for-268rc2-mm1-fix include/asm-x86_64/swiotlb.h
--- 25/include/asm-x86_64/swiotlb.h~x86-64-merge-for-268rc2-mm1-fix	2004-08-05 02:09:37.045248456 -0700
+++ 25-akpm/include/asm-x86_64/swiotlb.h	2004-08-05 02:09:52.463904464 -0700
@@ -5,6 +5,8 @@
 
 /* SWIOTLB interface */
 
+struct scatterlist;
+
 extern dma_addr_t swiotlb_map_single(struct device *hwdev, void *ptr, size_t size,
 				      int dir);
 extern void swiotlb_unmap_single(struct device *hwdev, dma_addr_t dev_addr,
_