From: "Antonino A. Daplas" <adaplas@gmail.com>

Fix vesafb hang when scroll mode is REDRAW.

Signed-off-by: Antonino Daplas <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 drivers/video/vesafb.c |    3 +++
 1 files changed, 3 insertions(+)

diff -puN drivers/video/vesafb.c~vesafb-trim-vesafb_pan_display-fix drivers/video/vesafb.c
--- devel/drivers/video/vesafb.c~vesafb-trim-vesafb_pan_display-fix	2005-12-12 01:26:16.000000000 -0800
+++ devel-akpm/drivers/video/vesafb.c	2005-12-12 01:26:16.000000000 -0800
@@ -417,6 +417,9 @@ static int __init vesafb_probe(struct pl
 	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;
_