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-2.6.30' into for-2.6.31
[pandora-kernel.git]
/
arch
/
alpha
/
kernel
/
sys_jensen.c
diff --git
a/arch/alpha/kernel/sys_jensen.c
b/arch/alpha/kernel/sys_jensen.c
index
e2516f9
..
2b5caf3
100644
(file)
--- a/
arch/alpha/kernel/sys_jensen.c
+++ b/
arch/alpha/kernel/sys_jensen.c
@@
-244,12
+244,11
@@
jensen_init_arch(void)
}
static void
-jensen_machine_check
(u64 vector, u64
la)
+jensen_machine_check
(unsigned long vector, unsigned long
la)
{
printk(KERN_CRIT "Machine check\n");
}
-
/*
* The System Vector
*/