diff --git a/[refs] b/[refs]
index 74ddbd60caa0..93d7ae46688f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 49a91dfed55f157a0e4148d6b961179932a54dc7
+refs/heads/master: ed03043c9a000255834800fcf8f02c6e8f5ba21f
diff --git a/trunk/drivers/staging/comedi/drivers/addi_apci_2200.c b/trunk/drivers/staging/comedi/drivers/addi_apci_2200.c
index f4bf3abec8a4..2cda2cd92faa 100644
--- a/trunk/drivers/staging/comedi/drivers/addi_apci_2200.c
+++ b/trunk/drivers/staging/comedi/drivers/addi_apci_2200.c
@@ -208,19 +208,8 @@ static int apci2200_auto_attach(struct comedi_device *dev,
 
 	/*  Allocate and Initialise AO Subdevice Structures */
 	s = &dev->subdevices[1];
-	if (devpriv->s_EeParameters.i_NbrAoChannel) {
-		s->type = COMEDI_SUBD_AO;
-		s->subdev_flags = SDF_WRITEABLE | SDF_GROUND | SDF_COMMON;
-		s->n_chan = devpriv->s_EeParameters.i_NbrAoChannel;
-		s->maxdata = devpriv->s_EeParameters.i_AoMaxdata;
-		s->len_chanlist =
-			devpriv->s_EeParameters.i_NbrAoChannel;
-		s->range_table = this_board->pr_AoRangelist;
-		s->insn_config = this_board->ao_config;
-		s->insn_write = this_board->ao_write;
-	} else {
-		s->type = COMEDI_SUBD_UNUSED;
-	}
+	s->type = COMEDI_SUBD_UNUSED;
+
 	/*  Allocate and Initialise DI Subdevice Structures */
 	s = &dev->subdevices[2];
 	if (devpriv->s_EeParameters.i_NbrDiChannel) {