diff options
author | Olof Johansson <olof@lixom.net> | 2013-02-05 19:31:33 -0500 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2013-02-05 19:31:51 -0500 |
commit | 5060c8881a4b177e27d5bcf351212f2bee125955 (patch) | |
tree | 17020202fd68bcdeba1e10a0a26c7e4e7fa83507 /arch/arm/plat-samsung/include/plat/s3c2416.h | |
parent | 7dcbeef7926fefa53b0466a27c90238744fb11d8 (diff) | |
parent | f44ddba3635e35317057e976888d4a12dcb0f842 (diff) |
Merge branch 'next/irq-s3c24xx' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/cleanup
From Kukjin Kim:
This is redoing the s3c24xx irqs in a generic way by using a declarative
approach.
* 'next/irq-s3c24xx' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
ARM: S3C24XX: transform s3c2443 subirqs into new structure
ARM: S3C24XX: modify s3c2443 irq init to initialize all irqs
ARM: S3C24XX: move s3c2443 irq code to irq.c
ARM: S3C24XX: transform s3c2416 irqs into new structure
ARM: S3C24XX: modify s3c2416 irq init to initialize all irqs
ARM: S3C24XX: move s3c2416 irq init to common irq code
ARM: S3C24XX: Modify s3c_irq_wake to use the hwirq property
ARM: S3C24XX: Move irq syscore-ops to irq-pm
ARM: S3C24XX: transform irq handling into a declarative form
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/plat-samsung/include/plat/s3c2416.h')
-rw-r--r-- | arch/arm/plat-samsung/include/plat/s3c2416.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/plat-samsung/include/plat/s3c2416.h b/arch/arm/plat-samsung/include/plat/s3c2416.h index 7178e338e25e..f27399a3c68d 100644 --- a/arch/arm/plat-samsung/include/plat/s3c2416.h +++ b/arch/arm/plat-samsung/include/plat/s3c2416.h | |||
@@ -25,6 +25,7 @@ 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 | 27 | ||
28 | extern void s3c2416_init_irq(void); | ||
28 | extern struct syscore_ops s3c2416_irq_syscore_ops; | 29 | extern struct syscore_ops s3c2416_irq_syscore_ops; |
29 | 30 | ||
30 | #else | 31 | #else |