diff --git a/[refs] b/[refs] index 1532113b6564..bf3b3a24d15a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c1db9a3090c8418088a9e12454144299359884f5 +refs/heads/master: 395d6d0f234d164f443f2bfd098091c39d60e6a5 diff --git a/trunk/drivers/staging/comedi/drivers/me4000.c b/trunk/drivers/staging/comedi/drivers/me4000.c index dfee15de752c..8394718ad848 100644 --- a/trunk/drivers/staging/comedi/drivers/me4000.c +++ b/trunk/drivers/staging/comedi/drivers/me4000.c @@ -332,17 +332,10 @@ static int me4000_probe(struct comedi_device *dev, struct comedi_devconfig *it) static int init_board_info(struct comedi_device *dev, struct pci_dev *pci_dev_p) { - int result; - /* Init spin locks */ /* spin_lock_init(&info->preload_lock); */ /* spin_lock_init(&info->ai_ctrl_lock); */ - /* Get the hardware revision */ - result = pci_read_config_byte(pci_dev_p, 0x08, &info->hw_revision); - if (result != PCIBIOS_SUCCESSFUL) - return result; - /* Get the vendor id */ info->vendor_id = pci_dev_p->vendor; diff --git a/trunk/drivers/staging/comedi/drivers/me4000.h b/trunk/drivers/staging/comedi/drivers/me4000.h index 8aa05f8071e5..afe91b1d0537 100644 --- a/trunk/drivers/staging/comedi/drivers/me4000.h +++ b/trunk/drivers/staging/comedi/drivers/me4000.h @@ -252,7 +252,6 @@ struct me4000_info { unsigned long timer_regbase; /* Base address of the timer circuit */ unsigned long program_regbase; /* Base address to set the program pin for the xilinx */ - unsigned char hw_revision; /* Hardware revision of the board */ unsigned short vendor_id; /* Meilhaus vendor id */ unsigned short device_id; /* Device id */