diff options
| author | Olof Johansson <olof@lixom.net> | 2013-02-05 16:31:33 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-02-05 16:31:51 -0800 |
| commit | 5060c8881a4b177e27d5bcf351212f2bee125955 (patch) | |
| tree | 17020202fd68bcdeba1e10a0a26c7e4e7fa83507 /arch/arm/mach-s3c24xx/mach-smdk2416.c | |
| parent | 7dcbeef7926fefa53b0466a27c90238744fb11d8 (diff) | |
| parent | f44ddba3635e35317057e976888d4a12dcb0f842 (diff) | |
| download | linux-5060c8881a4b177e27d5bcf351212f2bee125955.tar.gz linux-5060c8881a4b177e27d5bcf351212f2bee125955.tar.bz2 linux-5060c8881a4b177e27d5bcf351212f2bee125955.zip | |
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/mach-s3c24xx/mach-smdk2416.c')
| -rw-r--r-- | arch/arm/mach-s3c24xx/mach-smdk2416.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c24xx/mach-smdk2416.c b/arch/arm/mach-s3c24xx/mach-smdk2416.c index 72dfec689322..ebb2e61f3d07 100644 --- a/arch/arm/mach-s3c24xx/mach-smdk2416.c +++ b/arch/arm/mach-s3c24xx/mach-smdk2416.c @@ -250,7 +250,7 @@ MACHINE_START(SMDK2416, "SMDK2416") /* Maintainer: Yauhen Kharuzhy <jekhor@gmail.com> */ .atag_offset = 0x100, - .init_irq = s3c24xx_init_irq, + .init_irq = s3c2416_init_irq, .map_io = smdk2416_map_io, .init_machine = smdk2416_machine_init, .init_time = s3c24xx_timer_init, |