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

• Lines: 24
• Date: Thu Aug 5 15:04:52 1999
• Orig file: v2.3.12/linux/drivers/char/bttv.c
• Orig date: Thu Jul 8 15:42:20 1999

diff -u --recursive --new-file v2.3.12/linux/drivers/char/bttv.c linux/drivers/char/bttv.c
@@ -3538,12 +3538,13 @@
 
         btv->id=dev->device;
         btv->irq=dev->irq;
-        btv->bt848_adr=dev->base_address[0];
+        btv->bt848_adr=dev->resource[0].start;
         if (btv->id >= 878)
                 btv->i2c_command = 0x83;                   
         else
                 btv->i2c_command=(I2C_TIMING | BT848_I2C_SCL | BT848_I2C_SDA);
 
+#if 0
         if (remap[bttv_num])
         {
                 unsigned int dw = btv->bt848_adr;
@@ -3558,7 +3559,7 @@
                 pci_read_config_dword(dev, PCI_BASE_ADDRESS_0, &dw);
                 btv->dev->base_address[0] = btv->bt848_adr;
         }					
-        btv->bt848_adr&=PCI_BASE_ADDRESS_MEM_MASK;
+#endif        
         pci_read_config_byte(dev, PCI_CLASS_REVISION, &btv->revision);
         printk(KERN_INFO "bttv%d: Brooktree Bt%d (rev %d) ",
                bttv_num,btv->id, btv->revision);