diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-09-05 10:00:30 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-09-05 10:00:47 +0300 |
| commit | 95cd2ea7d54b41b0b2828587f108fe270d59eede (patch) | |
| tree | 623675092834a6a92ac1ef28cc5abb930c9a11b0 /arch/arm/mach-davinci/da8xx-dt.c | |
| parent | 66c117d7fa2ae429911e60d84bf31a90b2b96189 (diff) | |
| parent | e713c80a4e49d4bed5324d24755e42bf01c87556 (diff) | |
| download | linux-95cd2ea7d54b41b0b2828587f108fe270d59eede.tar.xz | |
Merge branch 'linus' into x86/urgent, to be able to merge a dependent fix
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arm/mach-davinci/da8xx-dt.c')
| -rw-r--r-- | arch/arm/mach-davinci/da8xx-dt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-davinci/da8xx-dt.c b/arch/arm/mach-davinci/da8xx-dt.c index 438f68547f4c..06b6451225c1 100644 --- a/arch/arm/mach-davinci/da8xx-dt.c +++ b/arch/arm/mach-davinci/da8xx-dt.c @@ -20,7 +20,7 @@ #define DA8XX_NUM_UARTS 3 -static const struct of_device_id da8xx_irq_match[] __initconst = { +static const struct of_device_id const da8xx_irq_match[] __initconst = { { .compatible = "ti,cp-intc", .data = cp_intc_of_init, }, { } }; @@ -59,7 +59,7 @@ static void __init da850_init_machine(void) } -static const char *da850_boards_compat[] __initdata = { +static const char *const da850_boards_compat[] __initconst = { "enbw,cmc", "ti,da850-evm", "ti,da850", |