ia64/xen-unstable

changeset 13901:46a8d51134d0

[IA64] dma-mapping.h user our own swiotlb.h header

Signed-off-by: Takanori Kasai <kasai.takanori@jp.fujitsu.com>
author awilliam@xenbuild2.aw
date Mon Feb 12 10:02:10 2007 -0700 (2007-02-12)
parents dea561992abe
children 5982d478698f
files linux-2.6-xen-sparse/include/asm-ia64/dma-mapping.h linux-2.6-xen-sparse/include/asm-ia64/swiotlb.h
line diff
     1.1 --- a/linux-2.6-xen-sparse/include/asm-ia64/dma-mapping.h	Mon Feb 12 09:54:20 2007 -0700
     1.2 +++ b/linux-2.6-xen-sparse/include/asm-ia64/dma-mapping.h	Mon Feb 12 10:02:10 2007 -0700
     1.3 @@ -10,7 +10,7 @@
     1.4  /* Needed for arch/i386/kernel/swiotlb.c and arch/i386/kernel/pci-dma-xen.c */
     1.5  #include <asm/hypervisor.h>
     1.6  /* Needed for arch/i386/kernel/swiotlb.c */
     1.7 -#include <asm-i386/mach-xen/asm/swiotlb.h>
     1.8 +#include <asm/swiotlb.h>
     1.9  #endif
    1.10  
    1.11  #ifndef CONFIG_XEN
     2.1 --- a/linux-2.6-xen-sparse/include/asm-ia64/swiotlb.h	Mon Feb 12 09:54:20 2007 -0700
     2.2 +++ b/linux-2.6-xen-sparse/include/asm-ia64/swiotlb.h	Mon Feb 12 10:02:10 2007 -0700
     2.3 @@ -34,8 +34,6 @@ extern void swiotlb_unmap_page(struct de
     2.4  extern int swiotlb_dma_supported(struct device *hwdev, u64 mask);
     2.5  extern void swiotlb_init(void);
     2.6  
     2.7 -extern unsigned int dma_bits;
     2.8 -
     2.9  #ifdef CONFIG_SWIOTLB
    2.10  extern int swiotlb;
    2.11  #else