diff --git a/[refs] b/[refs]
index 62845154480a..ab2ccf1e29b5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1cc9fb6dbf915e5c7e7e59bb7fab10572ddbb349
+refs/heads/master: b83734ec0975e1f53420b7a2d454612fc905a9d0
diff --git a/trunk/drivers/video/vesafb.c b/trunk/drivers/video/vesafb.c
index e16322d157d0..d6856f43d241 100644
--- a/trunk/drivers/video/vesafb.c
+++ b/trunk/drivers/video/vesafb.c
@@ -438,7 +438,7 @@ static int __init vesafb_probe(struct platform_device *dev)
 	info->var = vesafb_defined;
 	info->fix = vesafb_fix;
 	info->flags = FBINFO_FLAG_DEFAULT |
-		(ypan) ? FBINFO_HWACCEL_YPAN : 0;
+		(ypan ? FBINFO_HWACCEL_YPAN : 0);
 
 	if (!ypan)
 		info->fbops->fb_pan_display = NULL;