diff options
| author | Hiroshi Doyu <hdoyu@nvidia.com> | 2013-02-06 20:12:35 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-02-21 13:28:17 +0000 |
| commit | b44bf43b20cd4ff5009aead83e2c8a78fac3d189 (patch) | |
| tree | 4d70a9856955099d8e95c173046aa9656f477903 | |
| parent | 69dde4c52dbac2891b49ff9723d9c84efc5baf6f (diff) | |
| download | linux-3.10-b44bf43b20cd4ff5009aead83e2c8a78fac3d189.tar.gz linux-3.10-b44bf43b20cd4ff5009aead83e2c8a78fac3d189.tar.bz2 linux-3.10-b44bf43b20cd4ff5009aead83e2c8a78fac3d189.zip | |
ARM: 7640/1: memory: tegra_ahb_enable_smmu() depends on TEGRA_IOMMU_SMMU
New SoC, Tegra114 also uses SMMU. Change tegra_ahb_enable_smmu()'s
dependency from ARCH_TEGRA_3x_SOC to TEGRA_IOMMU_SMMU. No need to edit
whenever a new Tegra SoC comes.
The following combination caused build error, which this patch fixes.
CONFIG_ARCH_TEGRA_2x_SOC=y
CONFIG_ARCH_TEGRA_114_SOC=y
drivers/iommu/tegra-smmu.c:485: undefined reference to gra_ahb_enable_smmu'
Signed-off-by: Hiroshi Doyu <hdoyu@nvidia.com>
Tested-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| -rw-r--r-- | drivers/amba/tegra-ahb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/amba/tegra-ahb.c b/drivers/amba/tegra-ahb.c index 536c166f425..1247052b9db 100644 --- a/drivers/amba/tegra-ahb.c +++ b/drivers/amba/tegra-ahb.c @@ -129,7 +129,7 @@ static inline void gizmo_writel(struct tegra_ahb *ahb, u32 value, u32 offset) writel(value, ahb->regs + offset); } -#ifdef CONFIG_ARCH_TEGRA_3x_SOC +#ifdef CONFIG_TEGRA_IOMMU_SMMU static int tegra_ahb_match_by_smmu(struct device *dev, void *data) { struct tegra_ahb *ahb = dev_get_drvdata(dev); |