Merge branch 'entry-macro-cleanup' of git://sources.calxeda.com/kernel/linux into...

[firefly-linux-kernel-4.4.55.git] / arch / arm / mach-iop33x / include / mach / entry-macro.S

diff --git a/arch/arm/mach-iop33x/include/mach/entry-macro.S b/arch/arm/mach-iop33x/include/mach/entry-macro.S
index 4e1f7282b354042845d770a67fbc6b2cbde92d79..0a398fe1fba4da25809b6a77548f9a319bbaff8e 100644 (file)
--- a/arch/arm/mach-iop33x/include/mach/entry-macro.S
+++ b/arch/arm/mach-iop33x/include/mach/entry-macro.S
@@ -9,9 +9,6 @@
  */
 #include <mach/iop33x.h>
 
-       .macro  disable_fiq
-       .endm
-
        .macro get_irqnr_preamble, base, tmp
        mrc     p15, 0, \tmp, c15, c1, 0
        orr     \tmp, \tmp, #(1 << 6)