diff --git a/[refs] b/[refs]
index bb5723e7d32e..039c84ef11c6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 166d15fd1ef33c60af722f68fe9bd149c969567d
+refs/heads/master: df9133bf19c8fab1ac8932fe4a6e12de6f8f4ddf
diff --git a/trunk/drivers/staging/comedi/drivers/addi_apci_1032.c b/trunk/drivers/staging/comedi/drivers/addi_apci_1032.c
index d44ab6fd7fe0..b34001a539a0 100644
--- a/trunk/drivers/staging/comedi/drivers/addi_apci_1032.c
+++ b/trunk/drivers/staging/comedi/drivers/addi_apci_1032.c
@@ -248,21 +248,7 @@ static int apci1032_attach_pci(struct comedi_device *dev,
 
 	/*  Allocate and Initialise Timer Subdevice Structures */
 	s = &dev->subdevices[4];
-	if (devpriv->s_EeParameters.i_Timer) {
-		s->type = COMEDI_SUBD_TIMER;
-		s->subdev_flags = SDF_WRITEABLE | SDF_GROUND | SDF_COMMON;
-		s->n_chan = 1;
-		s->maxdata = 0;
-		s->len_chanlist = 1;
-		s->range_table = &range_digital;
-
-		s->insn_write = this_board->timer_write;
-		s->insn_read = this_board->timer_read;
-		s->insn_config = this_board->timer_config;
-		s->insn_bits = this_board->timer_bits;
-	} else {
-		s->type = COMEDI_SUBD_UNUSED;
-	}
+	s->type = COMEDI_SUBD_UNUSED;
 
 	/*  Allocate and Initialise TTL */
 	s = &dev->subdevices[5];