From: Andrew Morton <[email-masked]>

Cc: Sylvain Meyer <[email-masked]>
Signed-off-by: Andrew Morton <[email-masked]>
---

 drivers/video/intelfb/intelfbdrv.c |    1 +
 1 files changed, 1 insertion(+)

diff -puN drivers/video/intelfb/intelfbdrv.c~intelfb-add-voffset-option-to-avoid-conficts-with-xorg-i810-driver-fix drivers/video/intelfb/intelfbdrv.c
--- 25/drivers/video/intelfb/intelfbdrv.c~intelfb-add-voffset-option-to-avoid-conficts-with-xorg-i810-driver-fix	2005-05-29 17:47:55.000000000 -0700
+++ 25-akpm/drivers/video/intelfb/intelfbdrv.c	2005-05-29 17:47:55.000000000 -0700
@@ -238,6 +238,7 @@ static int noregister   = 0;
 static int probeonly    = 0;
 static int idonly       = 0;
 static int bailearly    = 0;
+static int voffset	= 48;
 static char *mode       = NULL;
 
 module_param(accel, bool, S_IRUGO);
_