xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge tag 'at91-cleanup2' of git://github.com/at91linux/linux-at91 into next/cleanup

Browse Source 
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>
This commit is contained in:
Kevin Hilman
2014-01-14 15:41:48 -08:00
parent 26d5f92adf e91a5555df
commit 273c2279ca
7 changed files with 187 additions and 275 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/clk/at91/pmc.c
View File

@@ -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",