diff options
| author | Olof Johansson <olof@lixom.net> | 2012-05-30 19:06:46 -0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-05-30 19:06:46 -0400 |
| commit | 929d138a3ba776145d2f421c2c4f16d922535090 (patch) | |
| tree | cb725266d584eb6a64d4bbc010449bb50ecac247 /arch/arm/plat-samsung | |
| parent | d64f41d8d2dabf4d10a11f7a5d1ef8706969655f (diff) | |
| parent | 67e7ebc21ff5a5bbcb10c9a980896f0e253bcd40 (diff) | |
Merge branch 'late/soc' into devel-late
* late/soc:
ARM: vexpress: Remove twice included header files
ARM: vexpress: Device Tree updates
ARM: EXYNOS: Support suspend and resume for EXYNOS5250
ARM: EXYNOS: Add Clock register list for save and restore
ARM: EXYNOS: Add PMU table for EXYNOS5250
ARM: EXYNOS: Rename of function for pm.c
ARM: EXYNOS: Remove GIC save & restore function
ARM: dts: Add node for interrupt combiner controller on EXYNOS5250
ARM: S3C24XX: add support for second irq set of S3C2416
Diffstat (limited to 'arch/arm/plat-samsung')
| -rw-r--r-- | arch/arm/plat-samsung/include/plat/s3c2416.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/plat-samsung/include/plat/s3c2416.h b/arch/arm/plat-samsung/include/plat/s3c2416.h index de2b5bdc5ebd..7178e338e25e 100644 --- a/arch/arm/plat-samsung/include/plat/s3c2416.h +++ b/arch/arm/plat-samsung/include/plat/s3c2416.h | |||
| @@ -24,6 +24,9 @@ extern void s3c2416_init_clocks(int xtal); | |||
| 24 | extern int s3c2416_baseclk_add(void); | 24 | extern int s3c2416_baseclk_add(void); |
| 25 | 25 | ||
| 26 | extern void s3c2416_restart(char mode, const char *cmd); | 26 | extern void s3c2416_restart(char mode, const char *cmd); |
| 27 | |||
| 28 | extern struct syscore_ops s3c2416_irq_syscore_ops; | ||
| 29 | |||
| 27 | #else | 30 | #else |
| 28 | #define s3c2416_init_clocks NULL | 31 | #define s3c2416_init_clocks NULL |
| 29 | #define s3c2416_init_uarts NULL | 32 | #define s3c2416_init_uarts NULL |