diff --git a/[refs] b/[refs]
index 76bc1516db85..48c3c063b1a5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dba5e190fcbe2a76b1a867ec6cbe9d7009e43708
+refs/heads/master: 87aedfe25a754a3ab49a7cfdb8f81bc882bc34fa
diff --git a/trunk/arch/arm/mach-omap1/mailbox.c b/trunk/arch/arm/mach-omap1/mailbox.c
index 12d68801450f..c0e1f48aa119 100644
--- a/trunk/arch/arm/mach-omap1/mailbox.c
+++ b/trunk/arch/arm/mach-omap1/mailbox.c
@@ -145,7 +145,6 @@ static int __devinit omap1_mbox_probe(struct platform_device *pdev)
 {
 	struct resource *mem;
 	int ret;
-	int i;
 	struct omap_mbox **list;
 
 	list = omap1_mboxes;