Merge branch 'master'

[sfrench/cifs-2.6.git] / arch / powerpc / sysdev / dart_iommu.c

diff --git a/arch/powerpc/sysdev/dart_iommu.c b/arch/powerpc/sysdev/dart_iommu.c
index e00b46b9514edb3159385d87adcd986e569e8874..6298264efe36110bdc8318001180d3d8eb751fba 100644 (file)
--- a/arch/powerpc/sysdev/dart_iommu.c
+++ b/arch/powerpc/sysdev/dart_iommu.c
@@ -59,7 +59,7 @@ static unsigned long dart_tablesize;
 static u32 *dart_vbase;
 
 /* Mapped base address for the dart */
-static unsigned int *__iomem dart;
+static unsigned int __iomem *dart;
 
 /* Dummy val that entries are set to when unused */
 static unsigned int dart_emptyval;
@@ -139,7 +139,6 @@ static void dart_build(struct iommu_table *tbl, long index,
 
                *(dp++) = DARTMAP_VALID | (rpn & DARTMAP_RPNMASK);
 
-               rpn++;
                uaddr += DART_PAGE_SIZE;
        }