hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'sirf/fixes' into fixes

This commit is contained in:
Arnd Bergmann 2011-09-12 14:59:37 +00:00
parent 1f51b001cc 6a53747be5
commit d035953e59
4 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/mach-prima2/clock.c
View File

@ -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)

1
arch/arm/mach-prima2/irq.c
View File

@ -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)

1
arch/arm/mach-prima2/rstc.c
View File

@ -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)

1
arch/arm/mach-prima2/timer.c
View File

@ -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)