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

Commit 6b6a4c06 authored by Magnus Damm's avatar Magnus Damm Committed by Rafael J. Wysocki
Browse files

ARM: mach-shmobile: rename clk_init() to shmobile_clk_init() 



Rename clk_init() to shmobile_clk_init() to avoid a potential
future name space collision with the common clock framework.

Signed-off-by: default avatarMagnus Damm <damm@opensource.se>
Signed-off-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
parent 8bac13f5

arch/arm/mach-shmobile/clock-r8a7740.c

+1 −1
Original line number Diff line number Diff line
@@ -376,7 +376,7 @@ void __init r8a7740_clock_init(u8 md_ck) 
	clkdev_add_table(lookups, ARRAY_SIZE(lookups));



	if (!ret)

		clk_init();

		shmobile_clk_init();

	else

		panic("failed to setup r8a7740 clocks\n");

}

arch/arm/mach-shmobile/clock-r8a7779.c

+1 −1
Original line number Diff line number Diff line
@@ -170,7 +170,7 @@ void __init r8a7779_clock_init(void) 
	clkdev_add_table(lookups, ARRAY_SIZE(lookups));



	if (!ret)

		clk_init();

		shmobile_clk_init();

	else

		panic("failed to setup r8a7779 clocks\n");

}

arch/arm/mach-shmobile/clock-sh7367.c

+1 −1
Original line number Diff line number Diff line
@@ -349,7 +349,7 @@ void __init sh7367_clock_init(void) 
	clkdev_add_table(lookups, ARRAY_SIZE(lookups));



	if (!ret)

		clk_init();

		shmobile_clk_init();

	else

		panic("failed to setup sh7367 clocks\n");

}

arch/arm/mach-shmobile/clock-sh7372.c

+1 −1
Original line number Diff line number Diff line
@@ -710,7 +710,7 @@ void __init sh7372_clock_init(void) 
	clkdev_add_table(lookups, ARRAY_SIZE(lookups));



	if (!ret)

		clk_init();

		shmobile_clk_init();

	else

		panic("failed to setup sh7372 clocks\n");

arch/arm/mach-shmobile/clock-sh7377.c

+1 −1
Original line number Diff line number Diff line
@@ -360,7 +360,7 @@ void __init sh7377_clock_init(void) 
	clkdev_add_table(lookups, ARRAY_SIZE(lookups));



	if (!ret)

		clk_init();

		shmobile_clk_init();

	else

		panic("failed to setup sh7377 clocks\n");

}