diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2010-05-19 05:04:10 -0400 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2010-05-19 05:04:10 -0400 |
| commit | 6071399674e813d797d9f458ec8913b86c85398e (patch) | |
| tree | d4d178b3ef312a41536d0db8288e9b1555a4c5b4 /arch/arm/plat-s5p/include/plat/s5p-clock.h | |
| parent | d16067b25e17d38ee11f5760f90edcecc4c77c09 (diff) | |
| parent | f64cacc3194f49c7371e2ce61c22de62b8652dc7 (diff) | |
ARM: Merge for-2635/s5pv210-clock
Merge branch 'for-2635/s5pv210-clock' into for-linus/samsung2
Diffstat (limited to 'arch/arm/plat-s5p/include/plat/s5p-clock.h')
| -rw-r--r-- | arch/arm/plat-s5p/include/plat/s5p-clock.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/plat-s5p/include/plat/s5p-clock.h b/arch/arm/plat-s5p/include/plat/s5p-clock.h index a476a9f14697..aa0447a18903 100644 --- a/arch/arm/plat-s5p/include/plat/s5p-clock.h +++ b/arch/arm/plat-s5p/include/plat/s5p-clock.h | |||
| @@ -28,6 +28,7 @@ extern struct clk clk_48m; | |||
| 28 | extern struct clk clk_fout_apll; | 28 | extern struct clk clk_fout_apll; |
| 29 | extern struct clk clk_fout_mpll; | 29 | extern struct clk clk_fout_mpll; |
| 30 | extern struct clk clk_fout_epll; | 30 | extern struct clk clk_fout_epll; |
| 31 | extern struct clk clk_fout_vpll; | ||
| 31 | extern struct clk clk_arm; | 32 | extern struct clk clk_arm; |
| 32 | extern struct clk clk_vpll; | 33 | extern struct clk clk_vpll; |
| 33 | 34 | ||