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

ARM: Merge for-2635/samsung-clock

Merge branch 'for-2635/samsung-clock' into for-linus/samsung2
parents f447ea4b f001d5b2
...@@ -33,6 +33,11 @@ struct clk clk_ext_xtal_mux = { ...@@ -33,6 +33,11 @@ struct clk clk_ext_xtal_mux = {
.id = -1, .id = -1,
}; };
struct clk clk_xusbxti = {
.name = "xusbxti",
.id = -1,
};
static struct clk s5p_clk_27m = { static struct clk s5p_clk_27m = {
.name = "clk_27m", .name = "clk_27m",
.id = -1, .id = -1,
......
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
#define clk_fin_vpll clk_ext_xtal_mux #define clk_fin_vpll clk_ext_xtal_mux
extern struct clk 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_48m;
extern struct clk clk_fout_apll; extern struct clk clk_fout_apll;
extern struct clk clk_fout_mpll; extern struct clk clk_fout_mpll;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment