Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d035953e authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'sirf/fixes' into fixes

parents 1f51b001 6a53747b

arch/arm/mach-prima2/clock.c

+1 −0
Original line number Diff line number Diff line
@@ -481,6 +481,7 @@ static void __init sirfsoc_clk_init(void) 


static struct of_device_id clkc_ids[] = {

	{ .compatible = "sirf,prima2-clkc" },

	{},

};



void __init sirfsoc_of_clk_init(void)

arch/arm/mach-prima2/irq.c

+1 −0
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ static __init void sirfsoc_irq_init(void) 


static struct of_device_id intc_ids[]  = {

	{ .compatible = "sirf,prima2-intc" },

	{},

};



void __init sirfsoc_of_irq_init(void)

arch/arm/mach-prima2/rstc.c

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ static DEFINE_MUTEX(rstc_lock); 


static struct of_device_id rstc_ids[]  = {

	{ .compatible = "sirf,prima2-rstc" },

	{},

};



static int __init sirfsoc_of_rstc_init(void)

arch/arm/mach-prima2/timer.c

+1 −0
Original line number Diff line number Diff line
@@ -190,6 +190,7 @@ static void __init sirfsoc_timer_init(void) 


static struct of_device_id timer_ids[] = {

	{ .compatible = "sirf,prima2-tick" },

	{},

};



static void __init sirfsoc_of_timer_map(void)