diff --git a/[refs] b/[refs]
index 40e4ca51c864..7f2733d40246 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 35fcaeb87d14c2385dac6ef1520e136f288d1bd6
+refs/heads/master: 30c4d3b862aa97c52a180c458f471e21a2e4db23
diff --git a/trunk/drivers/staging/comedi/drivers/ke_counter.c b/trunk/drivers/staging/comedi/drivers/ke_counter.c
index a24e93278a48..a2d0bb43631c 100644
--- a/trunk/drivers/staging/comedi/drivers/ke_counter.c
+++ b/trunk/drivers/staging/comedi/drivers/ke_counter.c
@@ -125,7 +125,7 @@ static int cnt_attach_pci(struct comedi_device *dev,
 			  struct pci_dev *pcidev)
 {
 	const struct cnt_board_struct *board;
-	struct comedi_subdevice *subdevice;
+	struct comedi_subdevice *s;
 	int ret;
 
 	comedi_set_hw_dev(dev, &pcidev->dev);
@@ -145,15 +145,15 @@ static int cnt_attach_pci(struct comedi_device *dev,
 	if (ret)
 		return ret;
 
-	subdevice = dev->subdevices + 0;
-	dev->read_subdev = subdevice;
+	s = dev->subdevices + 0;
+	dev->read_subdev = s;
 
-	subdevice->type = COMEDI_SUBD_COUNTER;
-	subdevice->subdev_flags = SDF_READABLE /* | SDF_COMMON */ ;
-	subdevice->n_chan = board->cnt_channel_nbr;
-	subdevice->maxdata = (1 << board->cnt_bits) - 1;
-	subdevice->insn_read = cnt_rinsn;
-	subdevice->insn_write = cnt_winsn;
+	s->type = COMEDI_SUBD_COUNTER;
+	s->subdev_flags = SDF_READABLE /* | SDF_COMMON */ ;
+	s->n_chan = board->cnt_channel_nbr;
+	s->maxdata = (1 << board->cnt_bits) - 1;
+	s->insn_read = cnt_rinsn;
+	s->insn_write = cnt_winsn;
 
 	/*  select 20MHz clock */
 	outb(3, dev->iobase + 248);