diff options
| author | Olof Johansson <olof@lixom.net> | 2011-12-12 03:56:44 +0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2011-12-12 03:56:44 +0400 |
| commit | 05da34d832d404ac9094db57e9295000207c9d62 (patch) | |
| tree | d0c60e673e527085aaddd76fb512311aa6159e40 /arch/arm/mach-shmobile/board-kota2.c | |
| parent | 5611cc4572e889b62a7b4c72a413536bf6a9c416 (diff) | |
| parent | eb3e1d9ded81a0036bb42b7c771307fa97f03dc9 (diff) | |
| download | linux-05da34d832d404ac9094db57e9295000207c9d62.tar.xz | |
Merge branch 'omap/omap4' into next/pm
Diffstat (limited to 'arch/arm/mach-shmobile/board-kota2.c')
| -rw-r--r-- | arch/arm/mach-shmobile/board-kota2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-shmobile/board-kota2.c b/arch/arm/mach-shmobile/board-kota2.c index bd9a78424d6b..1b4439d3f9d5 100644 --- a/arch/arm/mach-shmobile/board-kota2.c +++ b/arch/arm/mach-shmobile/board-kota2.c @@ -448,7 +448,7 @@ struct sys_timer kota2_timer = { MACHINE_START(KOTA2, "kota2") .map_io = kota2_map_io, .init_irq = kota2_init_irq, - .handle_irq = shmobile_handle_irq_gic, + .handle_irq = gic_handle_irq, .init_machine = kota2_init, .timer = &kota2_timer, MACHINE_END |