diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-20 17:57:46 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-20 17:57:46 +0200 |
| commit | fcd467137ea2da46ffe5cbfdb42e8a2b35f13dad (patch) | |
| tree | 9d8336ee0fba2fade8b5a7d07011e74294256838 /arch/arm/kernel/irq.c | |
| parent | bda2487997c3b7828a3765e7f2c37fdd6b7bdcbe (diff) | |
| parent | 5a567d78c437e3be1c512734cdfe64b4ae6b82d7 (diff) | |
Merge branch 'depends/rmk/smp' into tmp
Diffstat (limited to 'arch/arm/kernel/irq.c')
| -rw-r--r-- | arch/arm/kernel/irq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/kernel/irq.c b/arch/arm/kernel/irq.c index de3dcab8610..53919b230e8 100644 --- a/arch/arm/kernel/irq.c +++ b/arch/arm/kernel/irq.c @@ -35,8 +35,8 @@ #include <linux/list.h> #include <linux/kallsyms.h> #include <linux/proc_fs.h> -#include <linux/ftrace.h> +#include <asm/exception.h> #include <asm/system.h> #include <asm/mach/arch.h> #include <asm/mach/irq.h> |