diff --git a/[refs] b/[refs]
index a35f3220b76e..592cdaa12efc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 16450130a9f7006c91c9f49d725b9029fe711240
+refs/heads/master: 6555be0a1c25576be6270bb43f1bd444df7d86f8
diff --git a/trunk/drivers/staging/comedi/drivers/mpc8260cpm.c b/trunk/drivers/staging/comedi/drivers/mpc8260cpm.c
index 7250865e8d6e..bac0a7bb9cbd 100644
--- a/trunk/drivers/staging/comedi/drivers/mpc8260cpm.c
+++ b/trunk/drivers/staging/comedi/drivers/mpc8260cpm.c
@@ -38,11 +38,13 @@ It is apparently missing some code.
 
 extern unsigned long mpc8260_dio_reserved[4];
 
-typedef struct {
+struct mpc8260cpm_private {
+
 	int data;
 
-} mpc8260cpm_private;
-#define devpriv ((mpc8260cpm_private *)dev->private)
+};
+
+#define devpriv ((struct mpc8260cpm_private *)dev->private)
 
 static int mpc8260cpm_attach(struct comedi_device * dev, struct comedi_devconfig * it);
 static int mpc8260cpm_detach(struct comedi_device * dev);
@@ -71,7 +73,7 @@ static int mpc8260cpm_attach(struct comedi_device * dev, struct comedi_devconfig
 
 	dev->board_name = thisboard->name;
 
-	if (alloc_private(dev, sizeof(mpc8260cpm_private)) < 0)
+	if (alloc_private(dev, sizeof(struct mpc8260cpm_private)) < 0)
 		return -ENOMEM;
 
 	if (alloc_subdevices(dev, 4) < 0)