Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 324959
b: refs/heads/master
c: 395d6d0
h: refs/heads/master
i:
  324957: 289b5c3
  324955: 96124d3
  324951: ca46203
  324943: 8e37dc4
  324927: 89adafa
v: v3
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Sep 8, 2012
1 parent 0b02381 commit a9d0ad5
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 9 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: c1db9a3090c8418088a9e12454144299359884f5
refs/heads/master: 395d6d0f234d164f443f2bfd098091c39d60e6a5
7 changes: 0 additions & 7 deletions trunk/drivers/staging/comedi/drivers/me4000.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
1 change: 0 additions & 1 deletion trunk/drivers/staging/comedi/drivers/me4000.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 */

Expand Down

0 comments on commit a9d0ad5

Please sign in to comment.