diff options
| author | Kevin Hilman <khilman@linaro.org> | 2014-01-14 15:41:48 -0800 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2014-01-14 15:41:57 -0800 |
| commit | 273c2279ca502267fac40bcaecb35942380c429c (patch) | |
| tree | d062ef1ef525a7a6d4904eeabe52ae6221249846 /drivers/clk | |
| parent | 26d5f92adf87b1267feb8727ec59c4d0c0d933be (diff) | |
| parent | e91a5555df5883bbc204b0e1f8e0489d3f7f3f2e (diff) | |
Merge tag 'at91-cleanup2' of git://github.com/at91linux/linux-at91 into next/cleanup
From Nicolas Ferre:
Second cleanup pull-request for 3.14:
- a tiny fix for the recent AT91 CCF implementation
- the switch of one platform to DT with board file removal
* tag 'at91-cleanup2' of git://github.com/at91linux/linux-at91:
ARM: at91: switch Calao QIL-A9260 board to DT
clk: at91: fix pmc_clk_ids data type attriubte
Signed-off-by: Kevin Hilman <khilman@linaro.org>
Diffstat (limited to 'drivers/clk')
| -rw-r--r-- | drivers/clk/at91/pmc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clk/at91/pmc.c b/drivers/clk/at91/pmc.c index 11fceff8d9f1..6a61477a57e0 100644 --- a/drivers/clk/at91/pmc.c +++ b/drivers/clk/at91/pmc.c @@ -228,7 +228,7 @@ out_free_pmc: return NULL; } -static const struct of_device_id pmc_clk_ids[] __initdata = { +static const struct of_device_id pmc_clk_ids[] __initconst = { /* Main clock */ { .compatible = "atmel,at91rm9200-clk-main", |