diff --git a/[refs] b/[refs]
index 077b25a09706..c51bba08f372 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2efa42f2fadc06f7ceee14834624d2911a9f11f1
+refs/heads/master: 92b797f6a1347623a41caf02516b70e5fa706a90
diff --git a/trunk/drivers/pcmcia/pxa2xx_trizeps4.c b/trunk/drivers/pcmcia/pxa2xx_trizeps4.c
index 3a9ab4a39652..36c7a0b324d2 100644
--- a/trunk/drivers/pcmcia/pxa2xx_trizeps4.c
+++ b/trunk/drivers/pcmcia/pxa2xx_trizeps4.c
@@ -245,7 +245,6 @@ static int __init trizeps_pcmcia_init(void)
 
 static void __exit trizeps_pcmcia_exit(void)
 {
-	int i;
 	platform_device_unregister(trizeps_pcmcia_device);
 }