diff options
| author | Shawn Guo <shawn.guo@linaro.org> | 2012-05-12 07:32:09 +0200 |
|---|---|---|
| committer | Shawn Guo <shawn.guo@linaro.org> | 2012-05-12 07:32:09 +0200 |
| commit | 844d0b5a0b42d6c73114a1dc229db751120d226f (patch) | |
| tree | faf9f83e78ae24f6730d64999a89c35144da3b8a /arch/arm/mach-mxs/include | |
| parent | ARM: mxs: remove now unused timer_clk argument from mxs_timer_init (diff) | |
| parent | ARM: mxs: enable pinctrl support (diff) | |
| download | linux-844d0b5a0b42d6c73114a1dc229db751120d226f.tar.xz linux-844d0b5a0b42d6c73114a1dc229db751120d226f.zip | |
Merge branches 'clk/mxs' and 'imx/pinctrl/for-3.5' into mxs/dt/for-3.5
Diffstat (limited to 'arch/arm/mach-mxs/include')
| -rw-r--r-- | arch/arm/mach-mxs/include/mach/common.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-mxs/include/mach/common.h b/arch/arm/mach-mxs/include/mach/common.h index 9bdc95388871..84af61cf6a62 100644 --- a/arch/arm/mach-mxs/include/mach/common.h +++ b/arch/arm/mach-mxs/include/mach/common.h @@ -17,11 +17,13 @@ extern void mxs_timer_init(int); extern void mxs_restart(char, const char *); extern int mxs_saif_clkmux_select(unsigned int clkmux); +extern void mx23_soc_init(void); extern int mx23_register_gpios(void); extern int mx23_clocks_init(void); extern void mx23_map_io(void); extern void mx23_init_irq(void); +extern void mx28_soc_init(void); extern int mx28_register_gpios(void); extern int mx28_clocks_init(void); extern void mx28_map_io(void); |