diff --git a/[refs] b/[refs]
index c50422398a56..142b84f0cc3f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1a4520bea65f9205a240bbfa473547af1c77ab19
+refs/heads/master: 6af7ffc414828cda880a4e99e20f4f07880281e7
diff --git a/trunk/drivers/video/neofb.c b/trunk/drivers/video/neofb.c
index a2e201dc40f7..b961d5601bd9 100644
--- a/trunk/drivers/video/neofb.c
+++ b/trunk/drivers/video/neofb.c
@@ -486,10 +486,8 @@ static void vgaHWRestore(const struct fb_info *info,
 static inline int neo2200_sync(struct fb_info *info)
 {
 	struct neofb_par *par = info->par;
-	int waitcycles;
 
-	while (readl(&par->neo2200->bltStat) & 1)
-		waitcycles++;
+	while (readl(&par->neo2200->bltStat) & 1);
 	return 0;
 }