iommu/tegra: smmu: Fix build error because of rebase
Hiroshi DOYU [Tue, 17 Jul 2012 07:04:21 +0000 (10:04 +0300)]
Fix build error because of rebase.

Change-Id: Ie6cfbf3367287057a94bae0252b23caad6035193
Signed-off-by: Hiroshi DOYU <hdoyu@nvidia.com>
Reviewed-on: http://git-master/r/120016
Reviewed-by: Varun Colbert <vcolbert@nvidia.com>
Tested-by: Varun Colbert <vcolbert@nvidia.com>

drivers/iommu/tegra-smmu.c

index f5f62ce..939ef25 100644 (file)
@@ -1137,8 +1137,7 @@ static int tegra_smmu_resume(struct device *dev)
 static int tegra_smmu_probe(struct platform_device *pdev)
 {
        struct smmu_device *smmu;
-       struct resource *regs, *regs2;
-       struct tegra_smmu_window *window;
+       struct resource *regs, *regs2, *window;
        struct device *dev = &pdev->dev;
        int i, err = 0;