patch-2.1.103 linux/drivers/char/bttv.c

Next file: linux/drivers/char/console.c
Previous file: linux/drivers/cdrom/sbpcd.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.102/linux/drivers/char/bttv.c linux/drivers/char/bttv.c
@@ -1592,8 +1592,7 @@
 			        if ((unsigned int)v.base>=0xe0000000UL)
 			                btv->win.vidadr=(uint)v.base;
 				else 
-				  btv->win.vidadr=PAGE_OFFSET|
-				    uvirt_to_bus((uint)v.base);
+				  btv->win.vidadr= __va(uvirt_to_bus((uint)v.base));
 			btv->win.sheight=v.height;
 			btv->win.swidth=v.width;
 			btv->win.bpp=v.depth/8;

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov