diff --git a/[refs] b/[refs]
index f77d51eb9cad..8b0b5d3d50b6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e199ec9521602ec18d727c3a36618ef6b532f72f
+refs/heads/master: 14e065b3a1dba2b29fc55d92512dad8761e098cf
diff --git a/trunk/drivers/staging/comedi/drivers/adv_pci1710.c b/trunk/drivers/staging/comedi/drivers/adv_pci1710.c
index 58de0259dd4f..5bea3857b9c2 100644
--- a/trunk/drivers/staging/comedi/drivers/adv_pci1710.c
+++ b/trunk/drivers/staging/comedi/drivers/adv_pci1710.c
@@ -247,7 +247,6 @@ static const struct boardtype boardtypes[] = {
 		.have_irq	= 1,
 		.cardtype	= TYPE_PCI171X,
 		.n_aichan	= 16,
-		.n_aichand	= 0,
 		.n_aochan	= 2,
 		.n_dichan	= 16,
 		.n_dochan	= 16,
@@ -267,36 +266,19 @@ static const struct boardtype boardtypes[] = {
 		.cardtype	= TYPE_PCI1713,
 		.n_aichan	= 32,
 		.n_aichand	= 16,
-		.n_aochan	= 0,
-		.n_dichan	= 0,
-		.n_dochan	= 0,
-		.n_counter	= 0,
 		.ai_maxdata	= 0x0fff,
-		.ao_maxdata	= 0x0000,
 		.rangelist_ai	= &range_pci1710_3,
 		.rangecode_ai	= range_codes_pci1710_3,
-		.rangelist_ao	= NULL,
 		.ai_ns_min	= 10000,
 		.fifo_half_size	= 2048,
 	}, {
 		.name		= "pci1720",
 		.device_id	= 0x1720,
 		.iorange	= IORANGE_1720,
-		.have_irq	= 0,
 		.cardtype	= TYPE_PCI1720,
-		.n_aichan	= 0,
-		.n_aichand	= 0,
 		.n_aochan	= 4,
-		.n_dichan	= 0,
-		.n_dochan	= 0,
-		.n_counter	= 0,
-		.ai_maxdata	= 0x0000,
 		.ao_maxdata	= 0x0fff,
-		.rangelist_ai	= NULL,
-		.rangecode_ai	= NULL,
 		.rangelist_ao	= &range_pci1720,
-		.ai_ns_min	= 0,
-		.fifo_half_size	= 0,
 	}, {
 		.name		= "pci1731",
 		.device_id	= 0x1731,
@@ -304,16 +286,11 @@ static const struct boardtype boardtypes[] = {
 		.have_irq	= 1,
 		.cardtype	= TYPE_PCI171X,
 		.n_aichan	= 16,
-		.n_aichand	= 0,
-		.n_aochan	= 0,
 		.n_dichan	= 16,
 		.n_dochan	= 16,
-		.n_counter	= 0,
 		.ai_maxdata	= 0x0fff,
-		.ao_maxdata	= 0x0000,
 		.rangelist_ai	= &range_pci17x1,
 		.rangecode_ai	= range_codes_pci17x1,
-		.rangelist_ao	= NULL,
 		.ai_ns_min	= 10000,
 		.fifo_half_size	= 512,
 	}, {