X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fvideo%2Fvesafb.c;h=b8cb975083f06718fd7330748beff4099f6c3e7c;hb=9c920a8402f2bb9bd931801d429b65f4eb6a262b;hp=15f7f8e47614167497837ad83f2b766f8f8a79d3;hpb=a91482bdcc2e0f6035702e46f1b99043a0893346;p=linux-2.6.git

diff --git a/drivers/video/vesafb.c b/drivers/video/vesafb.c
index 15f7f8e47..b8cb97508 100644
--- a/drivers/video/vesafb.c
+++ b/drivers/video/vesafb.c
@@ -52,7 +52,7 @@ static int             mtrr      = 1;
 static int	       vram __initdata = 0; /* Set amount of memory to be used */
 static int             pmi_setpal = 0;	/* pmi for palette changes ??? */
 static int             ypan       = 0;  /* 0..nothing, 1..ypan, 2..ywrap */
-static unsigned short  *pmi_base  = NULL;
+static unsigned short  *pmi_base  = 0;
 static void            (*pmi_start)(void);
 static void            (*pmi_pal)(void);
 
@@ -378,8 +378,7 @@ static int __init vesafb_probe(struct device *device)
 	info->fbops = &vesafb_ops;
 	info->var = vesafb_defined;
 	info->fix = vesafb_fix;
-	info->flags = FBINFO_FLAG_DEFAULT |
-		(ypan) ? FBINFO_HWACCEL_YPAN : 0;
+	info->flags = FBINFO_FLAG_DEFAULT;
 
 	if (fb_alloc_cmap(&info->cmap, 256, 0) < 0) {
 		err = -ENXIO;