git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
[pandora-kernel.git]
/
arch
/
alpha
/
kernel
/
err_titan.c
diff --git
a/arch/alpha/kernel/err_titan.c
b/arch/alpha/kernel/err_titan.c
index
febe71c
..
6f38678
100644
(file)
--- a/
arch/alpha/kernel/err_titan.c
+++ b/
arch/alpha/kernel/err_titan.c
@@
-16,6
+16,7
@@
#include <asm/smp.h>
#include <asm/err_common.h>
#include <asm/err_ev6.h>
#include <asm/smp.h>
#include <asm/err_common.h>
#include <asm/err_ev6.h>
+#include <asm/irq_regs.h>
#include "err_impl.h"
#include "proto.h"
#include "err_impl.h"
#include "proto.h"
@@
-590,7
+591,7
@@
privateer_process_680_frame(struct el_common *mchk_header, int print)
(struct el_PRIVATEER_envdata_mcheck *)
((unsigned long)mchk_header + mchk_header->sys_offset);
(struct el_PRIVATEER_envdata_mcheck *)
((unsigned long)mchk_header + mchk_header->sys_offset);
- /* TODO - cat
a
gorize errors, for now, no error */
+ /* TODO - cat
e
gorize errors, for now, no error */
if (!print)
return status;
if (!print)
return status;