diff --git a/[refs] b/[refs]
index cbee272502b2..8a16783ac33d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f845fbac4e68573351965d9aaf626a63cc4151c7
+refs/heads/master: e53f87a02a0d77c519fb93c7aa0912956294050c
diff --git a/trunk/drivers/video/vesafb.c b/trunk/drivers/video/vesafb.c
index e6e56b8df2db..8982e540214c 100644
--- a/trunk/drivers/video/vesafb.c
+++ b/trunk/drivers/video/vesafb.c
@@ -417,6 +417,9 @@ static int __init vesafb_probe(struct platform_device *dev)
 	info->flags = FBINFO_FLAG_DEFAULT |
 		(ypan) ? FBINFO_HWACCEL_YPAN : 0;
 
+	if (!ypan)
+		info->fbops->fb_pan_display = NULL;
+
 	if (fb_alloc_cmap(&info->cmap, 256, 0) < 0) {
 		err = -ENOMEM;
 		goto err;