diff --git a/[refs] b/[refs]
index 74de3c1f908f..8a4f9c0fb243 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3d393c865b745a37a53081203b49278476a47a56
+refs/heads/master: 8dca707e148ed7c25a5d9fc37a831e5fc56776fa
diff --git a/trunk/drivers/staging/comedi/drivers/adl_pci7296.c b/trunk/drivers/staging/comedi/drivers/adl_pci7296.c
index 7fe4ce14fcf3..bd0f9ab226ef 100644
--- a/trunk/drivers/staging/comedi/drivers/adl_pci7296.c
+++ b/trunk/drivers/staging/comedi/drivers/adl_pci7296.c
@@ -56,12 +56,13 @@ static DEFINE_PCI_DEVICE_TABLE(adl_pci7296_pci_table) = {
 
 MODULE_DEVICE_TABLE(pci, adl_pci7296_pci_table);
 
-typedef struct {
+struct adl_pci7296_private {
 	int data;
 	struct pci_dev *pci_dev;
-} adl_pci7296_private;
+};
+
 
-#define devpriv ((adl_pci7296_private *)dev->private)
+#define devpriv ((struct adl_pci7296_private *)dev->private)
 
 static int adl_pci7296_attach(struct comedi_device * dev, struct comedi_devconfig * it);
 static int adl_pci7296_detach(struct comedi_device * dev);
@@ -86,7 +87,7 @@ static int adl_pci7296_attach(struct comedi_device * dev, struct comedi_devconfi
 	bus = it->options[0];
 	slot = it->options[1];
 
-	if (alloc_private(dev, sizeof(adl_pci7296_private)) < 0)
+	if (alloc_private(dev, sizeof(struct adl_pci7296_private)) < 0)
 		return -ENOMEM;
 
 	if (alloc_subdevices(dev, 4) < 0)