diff --git a/[refs] b/[refs] index 55f7b66f08f4..fd26893e483b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 35260aa6f7fd5c404efb76ffa9b58a0b5d115dec +refs/heads/master: e5ba6018d3db7a4c251ca6c75ea529d1e2de1f21 diff --git a/trunk/drivers/staging/comedi/drivers/adl_pci8164.c b/trunk/drivers/staging/comedi/drivers/adl_pci8164.c index 94230d64d3f0..247ef00a7c6c 100644 --- a/trunk/drivers/staging/comedi/drivers/adl_pci8164.c +++ b/trunk/drivers/staging/comedi/drivers/adl_pci8164.c @@ -55,12 +55,6 @@ Configuration Options: #define PCI_DEVICE_ID_PCI8164 0x8164 -struct adl_pci8164_private { - int data; -}; - -#define devpriv ((struct adl_pci8164_private *)dev->private) - /* all the read commands are the same except for the addition a constant * const to the data for inw() @@ -259,9 +253,6 @@ static int adl_pci8164_attach(struct comedi_device *dev, dev->board_name = "pci8164"; - if (alloc_private(dev, sizeof(struct adl_pci8164_private)) < 0) - return -ENOMEM; - ret = comedi_alloc_subdevices(dev, 4); if (ret) return ret;