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

• Lines: 18
• Date: Sat Jun 13 11:38:49 1998
• Orig file: v2.1.105/linux/drivers/char/bttv.c
• Orig date: Tue Jun 9 11:57:29 1998

diff -u --recursive --new-file v2.1.105/linux/drivers/char/bttv.c linux/drivers/char/bttv.c
@@ -1922,7 +1922,7 @@
 			}
 			btv->win.sheight=v.height;
 			btv->win.swidth=v.width;
-+			btv->win.bpp=((v.depth+1)&0x18)/8;
+			btv->win.bpp=((v.depth+1)&0x38)/8;
 			btv->win.depth=v.depth;
 			btv->win.bpl=v.bytesperline;
 			
@@ -2313,6 +2313,8 @@
 		"DEC DC21030", PCI_BASE_ADDRESS_0},
 	{ PCI_VENDOR_ID_MATROX, PCI_DEVICE_ID_MATROX_MIL,
 		"Matrox Millennium", PCI_BASE_ADDRESS_1},
+	{ PCI_VENDOR_ID_MATROX, PCI_DEVICE_ID_MATROX_MIL_2,
+		"Matrox Millennium II", PCI_BASE_ADDRESS_0},
 	{ PCI_VENDOR_ID_MATROX, 0x051a, "Matrox Mystique", PCI_BASE_ADDRESS_1},
 	{ PCI_VENDOR_ID_N9, PCI_DEVICE_ID_N9_I128, 
 		"Number Nine Imagine 128", PCI_BASE_ADDRESS_0},