diff options
| author | Shawn Guo <shawn.guo@linaro.org> | 2013-10-20 21:10:56 -0400 |
|---|---|---|
| committer | Shawn Guo <shawn.guo@linaro.org> | 2013-10-20 21:10:56 -0400 |
| commit | 6886530bab1e059a0fc5bab9813c739413d033bf (patch) | |
| tree | c5ae8b0853b09909986c3f8fca6e30fab24653b3 /arch/arm/mach-exynos/common.h | |
| parent | 4a10c2ac2f368583138b774ca41fac4207911983 (diff) | |
| parent | 64cc69abbb32e17aa44d2c696eca65cb6f9364ca (diff) | |
Merge remote-tracking branch 'shesselba/clk-of-init-v2_for-3.13' into imx/soc
Diffstat (limited to 'arch/arm/mach-exynos/common.h')
| -rw-r--r-- | arch/arm/mach-exynos/common.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-exynos/common.h b/arch/arm/mach-exynos/common.h index 8646a141ae46..f0fa2050d08d 100644 --- a/arch/arm/mach-exynos/common.h +++ b/arch/arm/mach-exynos/common.h | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | #include <linux/of.h> | 16 | #include <linux/of.h> |
| 17 | 17 | ||
| 18 | void mct_init(void __iomem *base, int irq_g0, int irq_l0, int irq_l1); | 18 | void mct_init(void __iomem *base, int irq_g0, int irq_l0, int irq_l1); |
| 19 | void exynos_init_time(void); | ||
| 20 | 19 | ||
| 21 | struct map_desc; | 20 | struct map_desc; |
| 22 | void exynos_init_io(void); | 21 | void exynos_init_io(void); |