linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / arch / powerpc / kernel / pci_direct_iommu.c

diff --git a/arch/powerpc/kernel/pci_direct_iommu.c b/arch/powerpc/kernel/pci_direct_iommu.c
index 72ce082..e1a32f8 100644 (file)
--- a/arch/powerpc/kernel/pci_direct_iommu.c
+++ b/arch/powerpc/kernel/pci_direct_iommu.c
@@ -82,17 +82,13 @@ static int pci_direct_dma_supported(struct device *dev, u64 mask)
        return mask < 0x100000000ull;
 }
 
-static struct dma_mapping_ops pci_direct_ops = {
-       .alloc_coherent = pci_direct_alloc_coherent,
-       .free_coherent = pci_direct_free_coherent,
-       .map_single = pci_direct_map_single,
-       .unmap_single = pci_direct_unmap_single,
-       .map_sg = pci_direct_map_sg,
-       .unmap_sg = pci_direct_unmap_sg,
-       .dma_supported = pci_direct_dma_supported,
-};
-
 void __init pci_direct_iommu_init(void)
 {
-       pci_dma_ops = pci_direct_ops;
+       pci_dma_ops.alloc_coherent = pci_direct_alloc_coherent;
+       pci_dma_ops.free_coherent = pci_direct_free_coherent;
+       pci_dma_ops.map_single = pci_direct_map_single;
+       pci_dma_ops.unmap_single = pci_direct_unmap_single;
+       pci_dma_ops.map_sg = pci_direct_map_sg;
+       pci_dma_ops.unmap_sg = pci_direct_unmap_sg;
+       pci_dma_ops.dma_supported = pci_direct_dma_supported;
 }