diff options
author | Herbert Xu <herbert@gondor.apana.org.au> | 2009-12-01 02:16:22 -0500 |
---|---|---|
committer | Herbert Xu <herbert@gondor.apana.org.au> | 2009-12-01 02:16:22 -0500 |
commit | 838632438145ac6863377eb12d8b8eef9c55d288 (patch) | |
tree | fbb0757df837f3c75a99c518a3596c38daef162d /arch/powerpc/sysdev/dart_iommu.c | |
parent | 9996508b3353063f2d6c48c1a28a84543d72d70b (diff) | |
parent | 29e553631b2a0d4eebd23db630572e1027a9967a (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/powerpc/sysdev/dart_iommu.c')
-rw-r--r-- | arch/powerpc/sysdev/dart_iommu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/sysdev/dart_iommu.c b/arch/powerpc/sysdev/dart_iommu.c index 89639ecbf381..ae3c4db86fe8 100644 --- a/arch/powerpc/sysdev/dart_iommu.c +++ b/arch/powerpc/sysdev/dart_iommu.c | |||
@@ -297,7 +297,7 @@ static void pci_dma_dev_setup_dart(struct pci_dev *dev) | |||
297 | /* We only have one iommu table on the mac for now, which makes | 297 | /* We only have one iommu table on the mac for now, which makes |
298 | * things simple. Setup all PCI devices to point to this table | 298 | * things simple. Setup all PCI devices to point to this table |
299 | */ | 299 | */ |
300 | dev->dev.archdata.dma_data = &iommu_table_dart; | 300 | set_iommu_table_base(&dev->dev, &iommu_table_dart); |
301 | } | 301 | } |
302 | 302 | ||
303 | static void pci_dma_bus_setup_dart(struct pci_bus *bus) | 303 | static void pci_dma_bus_setup_dart(struct pci_bus *bus) |