diff --git a/[refs] b/[refs]
index acade1da861b..5c843a9a89bc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 17883d63b32390098e42cb1a0739d361e38b528e
+refs/heads/master: 0c5ecbb0b77833e8ac5c90b7652684ae5f16480f
diff --git a/trunk/drivers/staging/comedi/drivers/cb_pcidas.c b/trunk/drivers/staging/comedi/drivers/cb_pcidas.c
index a5b3659bc1ca..f7090dec71c3 100644
--- a/trunk/drivers/staging/comedi/drivers/cb_pcidas.c
+++ b/trunk/drivers/staging/comedi/drivers/cb_pcidas.c
@@ -277,12 +277,9 @@ static const struct cb_pcidas_board cb_pcidas_boards[] = {
 		.ai_bits	= 12,
 		.ai_speed	= 3200,
 		.ao_nchan	= 2,
-		.has_ao_fifo	= 0,
 		.fifo_size	= 1024,
 		.ranges		= &cb_pcidas_ranges,
 		.trimpot	= AD7376,
-		.has_dac08	= 0,
-		.is_1602	= 0,
 	}, {
 		.name		= "pci-das1602/12",
 		.device_id	= 0x10,
@@ -296,7 +293,6 @@ static const struct cb_pcidas_board cb_pcidas_boards[] = {
 		.fifo_size	= 1024,
 		.ranges		= &cb_pcidas_ranges,
 		.trimpot	= AD7376,
-		.has_dac08	= 0,
 		.is_1602	= 1,
 	}, {
 		.name		= "pci-das1200/jr",
@@ -305,13 +301,9 @@ static const struct cb_pcidas_board cb_pcidas_boards[] = {
 		.ai_diff_chans	= 8,
 		.ai_bits	= 12,
 		.ai_speed	= 3200,
-		.ao_nchan	= 0,
-		.has_ao_fifo	= 0,
 		.fifo_size	= 1024,
 		.ranges		= &cb_pcidas_ranges,
 		.trimpot	= AD7376,
-		.has_dac08	= 0,
-		.is_1602	= 0,
 	}, {
 		.name		= "pci-das1602/16/jr",
 		.device_id	= 0x1C,
@@ -319,8 +311,6 @@ static const struct cb_pcidas_board cb_pcidas_boards[] = {
 		.ai_diff_chans	= 8,
 		.ai_bits	= 16,
 		.ai_speed	= 5000,
-		.ao_nchan	= 0,
-		.has_ao_fifo	= 0,
 		.fifo_size	= 512,
 		.ranges		= &cb_pcidas_ranges,
 		.trimpot	= AD8402,
@@ -333,13 +323,9 @@ static const struct cb_pcidas_board cb_pcidas_boards[] = {
 		.ai_diff_chans	= 8,
 		.ai_bits	= 12,
 		.ai_speed	= 4000,
-		.ao_nchan	= 0,
-		.has_ao_fifo	= 0,
 		.fifo_size	= 1024,
 		.ranges		= &cb_pcidas_ranges,
 		.trimpot	= AD7376,
-		.has_dac08	= 0,
-		.is_1602	= 0,
 	}, {
 		.name		= "pci-das1001",
 		.device_id	= 0x1a,
@@ -348,12 +334,9 @@ static const struct cb_pcidas_board cb_pcidas_boards[] = {
 		.ai_bits	= 12,
 		.ai_speed	= 6800,
 		.ao_nchan	= 2,
-		.has_ao_fifo	= 0,
 		.fifo_size	= 1024,
 		.ranges		= &cb_pcidas_alt_ranges,
 		.trimpot	= AD7376,
-		.has_dac08	= 0,
-		.is_1602	= 0,
 	}, {
 		.name		= "pci-das1002",
 		.device_id	= 0x1b,
@@ -362,12 +345,9 @@ static const struct cb_pcidas_board cb_pcidas_boards[] = {
 		.ai_bits	= 12,
 		.ai_speed	= 6800,
 		.ao_nchan	= 2,
-		.has_ao_fifo	= 0,
 		.fifo_size	= 1024,
 		.ranges		= &cb_pcidas_ranges,
 		.trimpot	= AD7376,
-		.has_dac08	= 0,
-		.is_1602	= 0,
 	},
 };