diff --git a/[refs] b/[refs]
index cc4fdb3ec88c..25a7cc4197bd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 25c7581bcdd11cf9b82a8ef062a10bea310cc9e9
+refs/heads/master: 92c4e22593c22eb0943b232c61c98b517081637d
diff --git a/trunk/arch/sparc64/kernel/irq.c b/trunk/arch/sparc64/kernel/irq.c
index 2d00ccffc55b..31e0fbb0d82c 100644
--- a/trunk/arch/sparc64/kernel/irq.c
+++ b/trunk/arch/sparc64/kernel/irq.c
@@ -638,7 +638,6 @@ static void map_prom_timers(void)
 {
 	struct device_node *dp;
 	unsigned int *addr;
-	int tnode, err;
 
 	/* PROM timer node hangs out in the top level of device siblings... */
 	dp = of_find_node_by_path("/");