diff options
author | Rob Herring <rob.herring@calxeda.com> | 2011-10-24 14:02:37 -0500 |
---|---|---|
committer | Rob Herring <rob.herring@calxeda.com> | 2011-10-24 14:02:37 -0500 |
commit | 3a8254364277fabe01bc0e12b9691722939f5ef3 (patch) | |
tree | 0befa43780509144cc840f767859006409e0506d /arch/arm/mach-shmobile/entry-intc.S | |
parent | 976d167615b64e14bc1491ca51d424e2ba9a5e84 (diff) | |
parent | 34471a9168c8bfd7f0d00989a7b0797ad27d585e (diff) | |
download | linux-3a8254364277fabe01bc0e12b9691722939f5ef3.tar.gz linux-3a8254364277fabe01bc0e12b9691722939f5ef3.tar.bz2 linux-3a8254364277fabe01bc0e12b9691722939f5ef3.zip |
Merge remote-tracking branch 'rmk/devel-stable' into HEAD
Diffstat (limited to 'arch/arm/mach-shmobile/entry-intc.S')
-rw-r--r-- | arch/arm/mach-shmobile/entry-intc.S | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/arm/mach-shmobile/entry-intc.S b/arch/arm/mach-shmobile/entry-intc.S index cac0a7ae2084..1a1c00ca39a2 100644 --- a/arch/arm/mach-shmobile/entry-intc.S +++ b/arch/arm/mach-shmobile/entry-intc.S @@ -51,7 +51,4 @@ .macro test_for_ipi, irqnr, irqstat, base, tmp .endm - .macro test_for_ltirq, irqnr, irqstat, base, tmp - .endm - arch_irq_handler shmobile_handle_irq_intc |