From d2d924c2123d3a3f21e865d505aff167fe7b4a3b Mon Sep 17 00:00:00 2001
From: Al Viro <viro@ftp.linux.org.uk>
Date: Fri, 23 Jun 2006 02:05:03 -0700
Subject: [PATCH] --- yaml --- r: 29022 b: refs/heads/master c:
 f1b5e520bb65e98d27632cd270d931838bd2a5da h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/arch/m68k/kernel/traps.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 8670821653ab..96ab9b606379 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: de290166552a037234bca44ed4bcbf4a4e9f5be9
+refs/heads/master: f1b5e520bb65e98d27632cd270d931838bd2a5da
diff --git a/trunk/arch/m68k/kernel/traps.c b/trunk/arch/m68k/kernel/traps.c
index 86aa63f91f73..837a88709902 100644
--- a/trunk/arch/m68k/kernel/traps.c
+++ b/trunk/arch/m68k/kernel/traps.c
@@ -114,7 +114,7 @@ void __init base_trap_init(void)
 	if(MACH_IS_SUN3X) {
 		extern e_vector *sun3x_prom_vbr;
 
-		__asm__ volatile ("movec %%vbr, %0" : "=r" ((void*)sun3x_prom_vbr));
+		__asm__ volatile ("movec %%vbr, %0" : "=r" (sun3x_prom_vbr));
 	}
 
 	/* setup the exception vector table */