diff --git a/[refs] b/[refs] index 92ebb5979c14..3a73a5f2e1c3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 718c39e8ff8ccc824883cc1078c1bf2fd2afeacc +refs/heads/master: 2852230eb210bbd249c5f217eef36b641b2e4bb8 diff --git a/trunk/drivers/staging/comedi/drivers/cb_pcimdas.c b/trunk/drivers/staging/comedi/drivers/cb_pcimdas.c index 34000671453a..9e4bac1b016d 100644 --- a/trunk/drivers/staging/comedi/drivers/cb_pcimdas.c +++ b/trunk/drivers/staging/comedi/drivers/cb_pcimdas.c @@ -134,8 +134,6 @@ static const struct cb_pcimdas_board cb_pcimdas_boards[] = { * struct. */ struct cb_pcimdas_private { - int data; - /* would be useful for a PCI device */ struct pci_dev *pci_dev; @@ -148,13 +146,6 @@ struct cb_pcimdas_private { /* Used for AO readback */ unsigned int ao_readback[2]; - - /* Used for DIO */ - unsigned short int port_a; /* copy of BADR4+0 */ - unsigned short int port_b; /* copy of BADR4+1 */ - unsigned short int port_c; /* copy of BADR4+2 */ - unsigned short int dio_mode; /* copy of BADR4+3 */ - }; /*