ARM: Merge for-2635/samsung-clock
Merge branch 'for-2635/samsung-clock' into for-linus/samsung2
This commit is contained in:
commit
71b4439657
2 changed files with 6 additions and 0 deletions
|
@ -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,
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Reference in a new issue