Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[sfrench/cifs-2.6.git] / arch / ia64 / include / asm / machvec_dig_vtd.h

diff --git a/arch/ia64/include/asm/machvec_dig_vtd.h b/arch/ia64/include/asm/machvec_dig_vtd.h
index 3400b561e711b63820429702b8710025c98b35cc..6ab1de5c45efe74b9e86e542f6b066578e2aa751 100644 (file)
--- a/arch/ia64/include/asm/machvec_dig_vtd.h
+++ b/arch/ia64/include/asm/machvec_dig_vtd.h
@@ -2,14 +2,6 @@
 #define _ASM_IA64_MACHVEC_DIG_VTD_h
 
 extern ia64_mv_setup_t                 dig_setup;
-extern ia64_mv_dma_alloc_coherent      vtd_alloc_coherent;
-extern ia64_mv_dma_free_coherent       vtd_free_coherent;
-extern ia64_mv_dma_map_single_attrs    vtd_map_single_attrs;
-extern ia64_mv_dma_unmap_single_attrs  vtd_unmap_single_attrs;
-extern ia64_mv_dma_map_sg_attrs                vtd_map_sg_attrs;
-extern ia64_mv_dma_unmap_sg_attrs      vtd_unmap_sg_attrs;
-extern ia64_mv_dma_supported           iommu_dma_supported;
-extern ia64_mv_dma_mapping_error       vtd_dma_mapping_error;
 extern ia64_mv_dma_init                        pci_iommu_alloc;
 
 /*
@@ -22,17 +14,5 @@ extern ia64_mv_dma_init                      pci_iommu_alloc;
 #define platform_name                          "dig_vtd"
 #define platform_setup                         dig_setup
 #define platform_dma_init                      pci_iommu_alloc
-#define platform_dma_alloc_coherent            vtd_alloc_coherent
-#define platform_dma_free_coherent             vtd_free_coherent
-#define platform_dma_map_single_attrs          vtd_map_single_attrs
-#define platform_dma_unmap_single_attrs                vtd_unmap_single_attrs
-#define platform_dma_map_sg_attrs              vtd_map_sg_attrs
-#define platform_dma_unmap_sg_attrs            vtd_unmap_sg_attrs
-#define platform_dma_sync_single_for_cpu       machvec_dma_sync_single
-#define platform_dma_sync_sg_for_cpu           machvec_dma_sync_sg
-#define platform_dma_sync_single_for_device    machvec_dma_sync_single
-#define platform_dma_sync_sg_for_device                machvec_dma_sync_sg
-#define platform_dma_supported                 iommu_dma_supported
-#define platform_dma_mapping_error             vtd_dma_mapping_error
 
 #endif /* _ASM_IA64_MACHVEC_DIG_VTD_h */