diff options
| author |   Ingo Molnar <mingo@kernel.org> | 2016-03-04 12:12:08 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-03-04 12:12:08 +0100 |
| commit | bc94b99636dc7bcccce439a9fb9c00065e2e2627 (patch) | |
| tree | bddbd29a5fd7b2d270d039efc1d6858791a2c98f /drivers/clk/tegra/clk-id.h | |
| parent | ACPI/EINJ: Allow memory error injection to NVDIMM (diff) | |
| parent | Linux 4.5-rc6 (diff) | |
| download | linux-dev-bc94b99636dc7bcccce439a9fb9c00065e2e2627.tar.xz linux-dev-bc94b99636dc7bcccce439a9fb9c00065e2e2627.zip | |
Merge tag 'v4.5-rc6' into core/resources, to resolve conflict
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/clk/tegra/clk-id.h')
| -rw-r--r-- | drivers/clk/tegra/clk-id.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/clk/tegra/clk-id.h b/drivers/clk/tegra/clk-id.h index 19ce0738ee76..62ea38187b71 100644 --- a/drivers/clk/tegra/clk-id.h +++ b/drivers/clk/tegra/clk-id.h @@ -11,6 +11,7 @@ enum clk_id { tegra_clk_afi, tegra_clk_amx, tegra_clk_amx1, + tegra_clk_apb2ape, tegra_clk_apbdma, tegra_clk_apbif, tegra_clk_ape, |