Merge branch 'omap-clock-fixes' of git://git.pwsan.com/linux-2.6

[linux-2.6-omap-h63xx.git] / drivers / staging / comedi / drivers / adl_pci7432.c

diff --git a/drivers/staging/comedi/drivers/adl_pci7432.c b/drivers/staging/comedi/drivers/adl_pci7432.c
index 8fdea81b59fc79825e07cec7998ee7aba7f82d87..a8f1715608d17ec23606509402a8b593a4274c67 100644 (file)
--- a/drivers/staging/comedi/drivers/adl_pci7432.c
+++ b/drivers/staging/comedi/drivers/adl_pci7432.c
@@ -51,12 +51,12 @@ static DEFINE_PCI_DEVICE_TABLE(adl_pci7432_pci_table) = {
 
 MODULE_DEVICE_TABLE(pci, adl_pci7432_pci_table);
 
-typedef struct {
+struct adl_pci7432_private {
        int data;
        struct pci_dev *pci_dev;
-} adl_pci7432_private;
+};
 
-#define devpriv ((adl_pci7432_private *)dev->private)
+#define devpriv ((struct adl_pci7432_private *)dev->private)
 
 static int adl_pci7432_attach(struct comedi_device * dev, struct comedi_devconfig * it);
 static int adl_pci7432_detach(struct comedi_device * dev);
@@ -90,7 +90,7 @@ static int adl_pci7432_attach(struct comedi_device * dev, struct comedi_devconfi
        bus = it->options[0];
        slot = it->options[1];
 
-       if (alloc_private(dev, sizeof(adl_pci7432_private)) < 0)
+       if (alloc_private(dev, sizeof(struct adl_pci7432_private)) < 0)
                return -ENOMEM;
 
        if (alloc_subdevices(dev, 2) < 0)