diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-09-22 13:08:57 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-09-22 13:08:57 +0200 |
commit | 0b88641f1bafdbd087d5e63987a30cc0eadd63b9 (patch) | |
tree | 81dcf756db373444140bb2623584710c628e3048 /arch/sh/kernel/irq.c | |
parent | x86, debug: gpio_free might sleep (diff) | |
parent | Linux 2.6.27-rc7 (diff) | |
download | linux-0b88641f1bafdbd087d5e63987a30cc0eadd63b9.tar.xz linux-0b88641f1bafdbd087d5e63987a30cc0eadd63b9.zip |
Merge commit 'v2.6.27-rc7' into x86/debug
Diffstat (limited to 'arch/sh/kernel/irq.c')
-rw-r--r-- | arch/sh/kernel/irq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/kernel/irq.c b/arch/sh/kernel/irq.c index a2a99e487e33..64b7690c664c 100644 --- a/arch/sh/kernel/irq.c +++ b/arch/sh/kernel/irq.c @@ -15,7 +15,7 @@ #include <asm/machvec.h> #include <asm/uaccess.h> #include <asm/thread_info.h> -#include <asm/cpu/mmu_context.h> +#include <cpu/mmu_context.h> atomic_t irq_err_count; |