Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-19 02:21:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

ARM: Merge for-2635/samsung-clock

Browse Source 
Merge branch 'for-2635/samsung-clock' into for-linus/samsung2
This commit is contained in:
Ben Dooks 2010-05-19 18:04:06 +09:00
commit 71b4439657
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arch/arm/plat-s5p/clock.c
View File

@ -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,

1
arch/arm/plat-s5p/include/plat/s5p-clock.h
View File

@ -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;