diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2012-05-20 03:04:59 +0900 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2012-05-20 03:04:59 +0900 |
| commit | 2de05a57467c43f58802cdeaa547aee73396b6f3 (patch) | |
| tree | e73f96c9954479a6909eb6195631284eac0fa47f /arch/arm/plat-samsung/include | |
| parent | ab5a4e6381d27a6554e6833383e536773e3a6ec1 (diff) | |
| parent | 380c3a545f7de096c0f84344ba70ea4cfd1a059f (diff) | |
| download | blackbird-obmc-linux-2de05a57467c43f58802cdeaa547aee73396b6f3.tar.gz blackbird-obmc-linux-2de05a57467c43f58802cdeaa547aee73396b6f3.zip | |
Merge branch 'next/devel-exynos5250-1' into next/devel-samsung-2
Diffstat (limited to 'arch/arm/plat-samsung/include')
| -rw-r--r-- | arch/arm/plat-samsung/include/plat/cpu.h | 2 | ||||
| -rw-r--r-- | arch/arm/plat-samsung/include/plat/s5p-clock.h | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm/plat-samsung/include/plat/cpu.h b/arch/arm/plat-samsung/include/plat/cpu.h index 787ceaca0be8..0721293fad63 100644 --- a/arch/arm/plat-samsung/include/plat/cpu.h +++ b/arch/arm/plat-samsung/include/plat/cpu.h @@ -202,7 +202,7 @@ extern struct bus_type s3c2443_subsys; extern struct bus_type s3c6410_subsys; extern struct bus_type s5p64x0_subsys; extern struct bus_type s5pv210_subsys; -extern struct bus_type exynos4_subsys; +extern struct bus_type exynos_subsys; extern void (*s5pc1xx_idle)(void); diff --git a/arch/arm/plat-samsung/include/plat/s5p-clock.h b/arch/arm/plat-samsung/include/plat/s5p-clock.h index 1de4b32f98e9..8364b4bea8b8 100644 --- a/arch/arm/plat-samsung/include/plat/s5p-clock.h +++ b/arch/arm/plat-samsung/include/plat/s5p-clock.h @@ -32,8 +32,10 @@ extern struct clk clk_48m; extern struct clk s5p_clk_27m; extern struct clk clk_fout_apll; extern struct clk clk_fout_bpll; +extern struct clk clk_fout_bpll_div2; extern struct clk clk_fout_cpll; extern struct clk clk_fout_mpll; +extern struct clk clk_fout_mpll_div2; extern struct clk clk_fout_epll; extern struct clk clk_fout_dpll; extern struct clk clk_fout_vpll; @@ -42,8 +44,10 @@ extern struct clk clk_vpll; extern struct clksrc_sources clk_src_apll; extern struct clksrc_sources clk_src_bpll; +extern struct clksrc_sources clk_src_bpll_fout; extern struct clksrc_sources clk_src_cpll; extern struct clksrc_sources clk_src_mpll; +extern struct clksrc_sources clk_src_mpll_fout; extern struct clksrc_sources clk_src_epll; extern struct clksrc_sources clk_src_dpll; |
