Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / macintosh / macio_asic.c

diff --git a/drivers/macintosh/macio_asic.c b/drivers/macintosh/macio_asic.c
index b6e7ddc09d76573eb0b423747bb613ce16599a7d..4daf9e5a7736f415023ff1ce07d6cb2d79d526b9 100644 (file)
--- a/drivers/macintosh/macio_asic.c
+++ b/drivers/macintosh/macio_asic.c
@@ -387,11 +387,10 @@ static struct macio_dev * macio_add_one_device(struct macio_chip *chip,
        /* Set the DMA ops to the ones from the PCI device, this could be
         * fishy if we didn't know that on PowerMac it's always direct ops
         * or iommu ops that will work fine
+        *
+        * To get all the fields, copy all archdata
         */
-       dev->ofdev.dev.archdata.dma_ops =
-               chip->lbus.pdev->dev.archdata.dma_ops;
-       dev->ofdev.dev.archdata.dma_data =
-               chip->lbus.pdev->dev.archdata.dma_data;
+       dev->ofdev.dev.archdata = chip->lbus.pdev->dev.archdata;
 #endif /* CONFIG_PCI */
 
 #ifdef DEBUG