diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2010-05-19 05:04:09 -0400 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2010-05-19 05:04:09 -0400 |
| commit | 2abbfb26de6cc8c362033f7d03278824113a4b0d (patch) | |
| tree | e709172d6ae38d12bdebf77faa87c3861d22275a /arch/arm/plat-samsung | |
| parent | ff1b8ba01dc80da338890a187c112fdd3c0b9202 (diff) | |
| parent | 05e021f095ffe9c7c1a695a3e2835f39243c6270 (diff) | |
ARM: Merge for-2635/s3c6410-clock
Merge branch 'for-2635/s3c6410-clock' into for-linus/samsung2
Diffstat (limited to 'arch/arm/plat-samsung')
| -rw-r--r-- | arch/arm/plat-samsung/include/plat/clock.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/plat-samsung/include/plat/clock.h b/arch/arm/plat-samsung/include/plat/clock.h index 60b62692ac7a..efbc984640c3 100644 --- a/arch/arm/plat-samsung/include/plat/clock.h +++ b/arch/arm/plat-samsung/include/plat/clock.h | |||
| @@ -74,6 +74,7 @@ extern struct clk clk_ext; | |||
| 74 | extern struct clk clk_h2; | 74 | extern struct clk clk_h2; |
| 75 | extern struct clk clk_27m; | 75 | extern struct clk clk_27m; |
| 76 | extern struct clk clk_48m; | 76 | extern struct clk clk_48m; |
| 77 | extern struct clk clk_xusbxti; | ||
| 77 | 78 | ||
| 78 | extern int clk_default_setrate(struct clk *clk, unsigned long rate); | 79 | extern int clk_default_setrate(struct clk *clk, unsigned long rate); |
| 79 | extern struct clk_ops clk_ops_def_setrate; | 80 | extern struct clk_ops clk_ops_def_setrate; |