From e262e853a6626733001bb7ec1c2a72f7b0f56a90 Mon Sep 17 00:00:00 2001
From: Jesper Nilsson <jesper.nilsson@axis.com>
Date: Tue, 3 Aug 2010 15:59:26 +0200
Subject: [PATCH] --- yaml --- r: 207133 b: refs/heads/master c:
 e2ee9bb2253c50a40a659f5c6daf3da1e77d9308 h: refs/heads/master i:   207131:
 aca6267f5d2885a4205997b646ea123821ae5106 v: v3

---
 [refs]                                  | 2 +-
 trunk/arch/cris/arch-v32/kernel/traps.c | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 6ecb2474ef1f..a569e24c9c34 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 399233265c2ce805cf19a4f56f79836faad6a034
+refs/heads/master: e2ee9bb2253c50a40a659f5c6daf3da1e77d9308
diff --git a/trunk/arch/cris/arch-v32/kernel/traps.c b/trunk/arch/cris/arch-v32/kernel/traps.c
index 9003e382cada..8bbe09c93132 100644
--- a/trunk/arch/cris/arch-v32/kernel/traps.c
+++ b/trunk/arch/cris/arch-v32/kernel/traps.c
@@ -9,8 +9,7 @@
 #include <hwregs/intr_vect_defs.h>
 #include <asm/irq.h>
 
-void
-show_registers(struct pt_regs *regs)
+void show_registers(struct pt_regs *regs)
 {
 	/*
 	 * It's possible to use either the USP register or current->thread.usp.
@@ -101,8 +100,7 @@ show_registers(struct pt_regs *regs)
 	}
 }
 
-void
-arch_enable_nmi(void)
+void arch_enable_nmi(void)
 {
 	unsigned long flags;