diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-03-10 08:53:29 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-03-10 08:53:29 -0500 |
| commit | 3afdb0f3528991de0833224f2dba60dc061e01fa (patch) | |
| tree | 0d9c7529c6cc2b41f0df778cc396edd74699721a /arch/arm/mach-mxs/include/mach/common.h | |
| parent | 71d8c5b11e3b5936ae6c2e0b1dd6f5c78b305b65 (diff) | |
| parent | f7fdaca910e6bc13659ecdffc28c97938b752e01 (diff) | |
Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable
Diffstat (limited to 'arch/arm/mach-mxs/include/mach/common.h')
| -rw-r--r-- | arch/arm/mach-mxs/include/mach/common.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-mxs/include/mach/common.h b/arch/arm/mach-mxs/include/mach/common.h index 59133eb3cc96..635bb5d9a20a 100644 --- a/arch/arm/mach-mxs/include/mach/common.h +++ b/arch/arm/mach-mxs/include/mach/common.h | |||
| @@ -13,6 +13,7 @@ | |||
| 13 | 13 | ||
| 14 | struct clk; | 14 | struct clk; |
| 15 | 15 | ||
| 16 | extern const u32 *mxs_get_ocotp(void); | ||
| 16 | extern int mxs_reset_block(void __iomem *); | 17 | extern int mxs_reset_block(void __iomem *); |
| 17 | extern void mxs_timer_init(struct clk *, int); | 18 | extern void mxs_timer_init(struct clk *, int); |
| 18 | 19 | ||