diff options
| author | Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com> | 2021-07-23 08:26:39 +0200 |
|---|---|---|
| committer | Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com> | 2021-07-23 08:26:39 +0200 |
| commit | 10dd9a8a5f7ec6799fc48548623b4fa58dc000bf (patch) | |
| tree | 0789b009030d6cff78b2364acf16c99d65f3f1fa /drivers/memory | |
| parent | e460a86aab669e00c5952a7643665f3096fbfe27 (diff) | |
| parent | eaf89f1cd38cf7256ab64424fe94014632044d57 (diff) | |
Merge branch 'for-v5.15/tegra-mc' into for-next
Diffstat (limited to 'drivers/memory')
| -rw-r--r-- | drivers/memory/tegra/tegra186.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/memory/tegra/tegra186.c b/drivers/memory/tegra/tegra186.c index e65eac5764d4..3d153881abc1 100644 --- a/drivers/memory/tegra/tegra186.c +++ b/drivers/memory/tegra/tegra186.c @@ -71,6 +71,7 @@ static int tegra186_mc_resume(struct tegra_mc *mc) return 0; } +#if IS_ENABLED(CONFIG_IOMMU_API) static void tegra186_mc_client_sid_override(struct tegra_mc *mc, const struct tegra_mc_client *client, unsigned int sid) @@ -108,6 +109,7 @@ static void tegra186_mc_client_sid_override(struct tegra_mc *mc, writel(sid, mc->regs + client->regs.sid.override); } } +#endif static int tegra186_mc_probe_device(struct tegra_mc *mc, struct device *dev) { |