Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6

[sfrench/cifs-2.6.git] / arch / mips / sgi-ip32 / crime.c

diff --git a/arch/mips/sgi-ip32/crime.c b/arch/mips/sgi-ip32/crime.c
index f1f2c45a6c80df2c22a091c44c91cc35ea6fcb3e..563c614ad021f37737fd82c77d98141655b79225 100644 (file)
--- a/arch/mips/sgi-ip32/crime.c
+++ b/arch/mips/sgi-ip32/crime.c
@@ -14,7 +14,6 @@
 #include <asm/bootinfo.h>
 #include <asm/io.h>
 #include <asm/mipsregs.h>
-#include <asm/ptrace.h>
 #include <asm/page.h>
 #include <asm/ip32/crime.h>
 #include <asm/ip32/mace.h>
@@ -36,8 +35,8 @@ void __init crime_init(void)
        id = crime->id;
        rev = id & CRIME_ID_REV;
        id = (id & CRIME_ID_IDBITS) >> 4;
-       printk (KERN_INFO "CRIME id %1x rev %d at 0x%0*lx\n",
-               id, rev, field, (unsigned long) CRIME_BASE);
+       printk(KERN_INFO "CRIME id %1x rev %d at 0x%0*lx\n",
+              id, rev, field, (unsigned long) CRIME_BASE);
 }
 
 irqreturn_t crime_memerr_intr(unsigned int irq, void *dev_id)
@@ -97,7 +96,7 @@ irqreturn_t crime_cpuerr_intr(unsigned int irq, void *dev_id)
        unsigned long addr = crime->cpu_error_addr & CRIME_CPU_ERROR_ADDR_MASK;
 
        addr <<= 2;
-       printk ("CRIME CPU error at 0x%09lx status 0x%08lx\n", addr, stat);
+       printk("CRIME CPU error at 0x%09lx status 0x%08lx\n", addr, stat);
        crime->cpu_error_stat = 0;
 
        return IRQ_HANDLED;