Commit 71b44396 authored by Ben Dooks's avatar Ben Dooks
Browse files

ARM: Merge for-2635/samsung-clock 

Merge branch 'for-2635/samsung-clock' into for-linus/samsung2
parents f447ea4b f001d5b2

arch/arm/plat-s5p/clock.c

+5 −0
Original line number Diff line number Diff line
@@ -33,6 +33,11 @@ struct clk clk_ext_xtal_mux = { 
	.id		= -1,

};



struct clk clk_xusbxti = {

	.name		= "xusbxti",

	.id		= -1,

};



static struct clk s5p_clk_27m = {

	.name		= "clk_27m",

	.id		= -1,

arch/arm/plat-s5p/include/plat/s5p-clock.h

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#define clk_fin_vpll clk_ext_xtal_mux



extern struct clk clk_ext_xtal_mux;

extern struct clk clk_xusbxti;

extern struct clk clk_48m;

extern struct clk clk_fout_apll;

extern struct clk clk_fout_mpll;