diff options
| author | Ingo Molnar <mingo@kernel.org> | 2020-06-26 12:24:42 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2020-06-26 12:24:42 +0200 |
| commit | 2c92d787cc9fad57d05c96bd117782183768258a (patch) | |
| tree | 51c0c567b8be2fd56073a8ce31f8ebd123a7d562 /drivers/amba/tegra-ahb.c | |
| parent | 145a773aef83181d47ebab21bb33c89233aadb1e (diff) | |
| parent | 8be3a53e18e0e1a98f288f6c7f5e9da3adbe9c49 (diff) | |
Merge branch 'linus' into x86/entry, to resolve conflictsx86_entry_for_5.8
Conflicts:
arch/x86/kernel/traps.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/amba/tegra-ahb.c')
| -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 57d3b2e2d007..0b2c20fddb7c 100644 --- a/drivers/amba/tegra-ahb.c +++ b/drivers/amba/tegra-ahb.c @@ -120,7 +120,7 @@ static const u32 tegra_ahb_gizmo[] = { struct tegra_ahb { void __iomem *regs; struct device *dev; - u32 ctx[0]; + u32 ctx[]; }; static inline u32 gizmo_readl(struct tegra_ahb *ahb, u32 offset) |