diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-05-11 16:05:09 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-05-11 16:05:09 +0200 |
| commit | 191a66353b22fad8ac89404ab4c929cbe7b0afb2 (patch) | |
| tree | bd7affc4bc640eb42e5ff3285922497285f8fdd7 /drivers/clk/ti/composite.c | |
| parent | x86/smpboot: Skip delays during SMP initialization similar to Xen (diff) | |
| parent | x86/alternatives: Switch AMD F15h and later to the P6 NOPs (diff) | |
| download | linux-191a66353b22fad8ac89404ab4c929cbe7b0afb2.tar.xz linux-191a66353b22fad8ac89404ab4c929cbe7b0afb2.zip | |
Merge branch 'x86/asm' into x86/apic, to resolve a conflict
Conflicts:
arch/x86/kernel/apic/io_apic.c
arch/x86/kernel/apic/vector.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/clk/ti/composite.c')
| -rw-r--r-- | drivers/clk/ti/composite.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clk/ti/composite.c b/drivers/clk/ti/composite.c index 3654f61912eb..96f83cedb4b3 100644 --- a/drivers/clk/ti/composite.c +++ b/drivers/clk/ti/composite.c @@ -69,7 +69,7 @@ struct component_clk { struct list_head link; }; -static const char * __initconst component_clk_types[] = { +static const char * const component_clk_types[] __initconst = { "gate", "divider", "mux" }; |