diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2007-04-26 04:31:28 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2007-04-26 04:31:28 -0400 |
| commit | ef2e58ea6b9931c3a4816c66593da49bb20e3b24 (patch) | |
| tree | ce7432add3becbe78de4ea06425cd2d9e91f4ada /arch/alpha/kernel/err_titan.c | |
| parent | 06d63cc51d47f572009138a7f3ac34d95773405d (diff) | |
| parent | de46c33745f5e2ad594c72f2cf5f490861b16ce1 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/alpha/kernel/err_titan.c')
| -rw-r--r-- | arch/alpha/kernel/err_titan.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/alpha/kernel/err_titan.c b/arch/alpha/kernel/err_titan.c index febe71c6869f..543d96d7fa2b 100644 --- a/arch/alpha/kernel/err_titan.c +++ b/arch/alpha/kernel/err_titan.c | |||
| @@ -16,6 +16,7 @@ | |||
| 16 | #include <asm/smp.h> | 16 | #include <asm/smp.h> |
| 17 | #include <asm/err_common.h> | 17 | #include <asm/err_common.h> |
| 18 | #include <asm/err_ev6.h> | 18 | #include <asm/err_ev6.h> |
| 19 | #include <asm/irq_regs.h> | ||
| 19 | 20 | ||
| 20 | #include "err_impl.h" | 21 | #include "err_impl.h" |
| 21 | #include "proto.h" | 22 | #include "proto.h" |