Subversion Repositories shark

Compare Revisions

Ignore whitespace Rev 622 → Rev 623

/shark/trunk/drivers/bttv/include/drivers/fg.h
File deleted
/shark/trunk/drivers/bttv/bttv-driver.c
2292,7 → 2292,7
if (NULL == btv->fbuf.base)
return -EINVAL;
if (!fh->ov.setup_ok) {
dprintk("bttv%d: overlay: !setup_ok\n",btv->nr);
//dprintk("bttv%d: overlay: !setup_ok\n",btv->nr);
return -EINVAL;
}
}
/shark/trunk/drivers/bttv/bttv-cards.c
262,7 → 262,7
{ 0xa0fca1a0, BTTV_ZOLTRIX, "Face to Face Tvmax" },
{ 0x01010071, BTTV_NEBULA_DIGITV, "Nebula Electronics DigiTV" },
 
// likely broken, vendor id doesn't match the other magic views ...
{ 0x200A1295, BTTV_PXC200, "Imagenation PXC200"},
//{ 0xa0fca04f, BTTV_MAGICTVIEW063, "Guillemot Maxi TV Video 3" },
{ 0, -1, NULL }
2203,6 → 2203,9
if (BTTV_UNKNOWN == btv->type) {
bttv_readee(btv,eeprom_data,0xa0);
identify_by_eeprom(btv,eeprom_data);
#ifdef __FORCE_PXC__
init_PXC200(btv);
#endif
}
 
switch (btv->type) {