Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6

[linux-2.6-omap-h63xx.git] / arch / alpha / kernel / core_polaris.c

diff --git a/arch/alpha/kernel/core_polaris.c b/arch/alpha/kernel/core_polaris.c
index 277674a500ff448ee3e5be999fbc1b055313f307..c5a271d37abd734b248e669b506d886844ab1791 100644 (file)
--- a/arch/alpha/kernel/core_polaris.c
+++ b/arch/alpha/kernel/core_polaris.c
@@ -187,8 +187,7 @@ polaris_pci_clr_err(void)
 }
 
 void
-polaris_machine_check(unsigned long vector, unsigned long la_ptr,
-                     struct pt_regs * regs)
+polaris_machine_check(unsigned long vector, unsigned long la_ptr)
 {
        /* Clear the error before any reporting.  */
        mb();
@@ -198,6 +197,6 @@ polaris_machine_check(unsigned long vector, unsigned long la_ptr,
        wrmces(0x7);
        mb();
 
-       process_mcheck_info(vector, la_ptr, regs, "POLARIS",
+       process_mcheck_info(vector, la_ptr, "POLARIS",
                            mcheck_expected(0));
 }