Commit d035953e authored by Arnd Bergmann's avatar Arnd Bergmann

Merge branch 'sirf/fixes' into fixes

parents 1f51b001 6a53747b
...@@ -481,6 +481,7 @@ static void __init sirfsoc_clk_init(void) ...@@ -481,6 +481,7 @@ static void __init sirfsoc_clk_init(void)
static struct of_device_id clkc_ids[] = { static struct of_device_id clkc_ids[] = {
{ .compatible = "sirf,prima2-clkc" }, { .compatible = "sirf,prima2-clkc" },
{},
}; };
void __init sirfsoc_of_clk_init(void) void __init sirfsoc_of_clk_init(void)
......
...@@ -51,6 +51,7 @@ static __init void sirfsoc_irq_init(void) ...@@ -51,6 +51,7 @@ static __init void sirfsoc_irq_init(void)
static struct of_device_id intc_ids[] = { static struct of_device_id intc_ids[] = {
{ .compatible = "sirf,prima2-intc" }, { .compatible = "sirf,prima2-intc" },
{},
}; };
void __init sirfsoc_of_irq_init(void) void __init sirfsoc_of_irq_init(void)
......
...@@ -19,6 +19,7 @@ static DEFINE_MUTEX(rstc_lock); ...@@ -19,6 +19,7 @@ static DEFINE_MUTEX(rstc_lock);
static struct of_device_id rstc_ids[] = { static struct of_device_id rstc_ids[] = {
{ .compatible = "sirf,prima2-rstc" }, { .compatible = "sirf,prima2-rstc" },
{},
}; };
static int __init sirfsoc_of_rstc_init(void) static int __init sirfsoc_of_rstc_init(void)
......
...@@ -190,6 +190,7 @@ static void __init sirfsoc_timer_init(void) ...@@ -190,6 +190,7 @@ static void __init sirfsoc_timer_init(void)
static struct of_device_id timer_ids[] = { static struct of_device_id timer_ids[] = {
{ .compatible = "sirf,prima2-tick" }, { .compatible = "sirf,prima2-tick" },
{},
}; };
static void __init sirfsoc_of_timer_map(void) static void __init sirfsoc_of_timer_map(void)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment