From a5658e9fe228e33179109124936782370eed48ec Mon Sep 17 00:00:00 2001 From: Olof Johansson Date: Thu, 31 Jan 2008 00:41:30 -0600 Subject: [PATCH] --- yaml --- r: 81436 b: refs/heads/master c: 24af8cb86973dde9bf8df51bef923fda8718bdb5 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/powerpc/platforms/pasemi/iommu.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index f5dad2c24730..4a6bb073058f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8af03e782cae1e0a0f530ddd22301cdd12cf9dc0 +refs/heads/master: 24af8cb86973dde9bf8df51bef923fda8718bdb5 diff --git a/trunk/arch/powerpc/platforms/pasemi/iommu.c b/trunk/arch/powerpc/platforms/pasemi/iommu.c index 9916a0f3e431..c5cfd4b04a83 100644 --- a/trunk/arch/powerpc/platforms/pasemi/iommu.c +++ b/trunk/arch/powerpc/platforms/pasemi/iommu.c @@ -182,8 +182,10 @@ static void pci_dma_dev_setup_pasemi(struct pci_dev *dev) * CONFIG_PPC_PASEMI_IOMMU_DMA_FORCE at build time. */ if (dev->vendor == 0x1959 && dev->device == 0xa007 && - !firmware_has_feature(FW_FEATURE_LPAR)) + !firmware_has_feature(FW_FEATURE_LPAR)) { dev->dev.archdata.dma_ops = &dma_direct_ops; + dev->dev.archdata.dma_data = 0; + } #endif dev->dev.archdata.dma_data = &iommu_table_iobmap;