diff --git a/[refs] b/[refs] index d73fbcabc06b..d24318b93195 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: caeb2490e046909fcb2f8209b88458a147011819 +refs/heads/master: b94cea48ab8428ae803f4e27131367574295853d diff --git a/trunk/drivers/staging/comedi/drivers/adl_pci7296.c b/trunk/drivers/staging/comedi/drivers/adl_pci7296.c index b003ed0fb57f..19b47af9c10e 100644 --- a/trunk/drivers/staging/comedi/drivers/adl_pci7296.c +++ b/trunk/drivers/staging/comedi/drivers/adl_pci7296.c @@ -47,12 +47,6 @@ Configuration Options: #define PCI_DEVICE_ID_PCI7296 0x7296 -struct adl_pci7296_private { - int data; -}; - -#define devpriv ((struct adl_pci7296_private *)dev->private) - static struct pci_dev *adl_pci7296_find_pci(struct comedi_device *dev, struct comedi_devconfig *it) { @@ -89,9 +83,6 @@ static int adl_pci7296_attach(struct comedi_device *dev, dev->board_name = "pci7432"; - if (alloc_private(dev, sizeof(struct adl_pci7296_private)) < 0) - return -ENOMEM; - ret = comedi_alloc_subdevices(dev, 4); if (ret) return ret;