From 16b5bc764fae42c5c2af2700138c605cdefa8f7c Mon Sep 17 00:00:00 2001
From: H Hartley Sweeten <hartleys@visionengravers.com>
Date: Wed, 24 Oct 2012 16:32:54 -0700
Subject: [PATCH] --- yaml --- r: 337262 b: refs/heads/master c:
 0963fa1c83474557e6e868fbe56ddd53c99fb929 h: refs/heads/master v: v3

---
 [refs]                                        |  2 +-
 .../staging/comedi/drivers/cb_pcidda.c        | 70 ++++++++-----------
 2 files changed, 31 insertions(+), 41 deletions(-)

diff --git a/[refs] b/[refs]
index 9f58dd09c127..aba523e1cc7f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8545d2a8117f9d8cff9e066310125f6e93503edb
+refs/heads/master: 0963fa1c83474557e6e868fbe56ddd53c99fb929
diff --git a/trunk/drivers/staging/comedi/drivers/cb_pcidda.c b/trunk/drivers/staging/comedi/drivers/cb_pcidda.c
index 2af32783e00b..f1aa9c943157 100644
--- a/trunk/drivers/staging/comedi/drivers/cb_pcidda.c
+++ b/trunk/drivers/staging/comedi/drivers/cb_pcidda.c
@@ -125,11 +125,6 @@ static const struct comedi_lrange cb_pcidda_ranges = {
 	}
 };
 
-/*
- * Board descriptions for two imaginary boards.  Describing the
- * boards in this way is optional, and completely driver-dependent.
- * Some drivers use arrays such as this, other do not.
- */
 struct cb_pcidda_board {
 	const char *name;
 	unsigned short device_id;
@@ -139,41 +134,36 @@ struct cb_pcidda_board {
 
 static const struct cb_pcidda_board cb_pcidda_boards[] = {
 	{
-	 .name = "pci-dda02/12",
-	 .device_id = PCI_DEVICE_ID_DDA02_12,
-	 .ao_chans = 2,
-	 .ao_bits = 12,
-	 },
-	{
-	 .name = "pci-dda04/12",
-	 .device_id = PCI_DEVICE_ID_DDA04_12,
-	 .ao_chans = 4,
-	 .ao_bits = 12,
-	 },
-	{
-	 .name = "pci-dda08/12",
-	 .device_id = PCI_DEVICE_ID_DDA08_12,
-	 .ao_chans = 8,
-	 .ao_bits = 12,
-	 },
-	{
-	 .name = "pci-dda02/16",
-	 .device_id = PCI_DEVICE_ID_DDA02_16,
-	 .ao_chans = 2,
-	 .ao_bits = 16,
-	 },
-	{
-	 .name = "pci-dda04/16",
-	 .device_id = PCI_DEVICE_ID_DDA04_16,
-	 .ao_chans = 4,
-	 .ao_bits = 16,
-	 },
-	{
-	 .name = "pci-dda08/16",
-	 .device_id = PCI_DEVICE_ID_DDA08_16,
-	 .ao_chans = 8,
-	 .ao_bits = 16,
-	 },
+		.name		= "pci-dda02/12",
+		.device_id	= PCI_DEVICE_ID_DDA02_12,
+		.ao_chans	= 2,
+		.ao_bits	= 12,
+	}, {
+		.name		= "pci-dda04/12",
+		.device_id	= PCI_DEVICE_ID_DDA04_12,
+		.ao_chans	= 4,
+		.ao_bits	= 12,
+	}, {
+		.name		= "pci-dda08/12",
+		.device_id	= PCI_DEVICE_ID_DDA08_12,
+		.ao_chans	= 8,
+		.ao_bits	= 12,
+	}, {
+		.name		= "pci-dda02/16",
+		.device_id	= PCI_DEVICE_ID_DDA02_16,
+		.ao_chans	= 2,
+		.ao_bits	= 16,
+	}, {
+		.name		= "pci-dda04/16",
+		.device_id	= PCI_DEVICE_ID_DDA04_16,
+		.ao_chans	= 4,
+		.ao_bits	= 16,
+	}, {
+		.name		= "pci-dda08/16",
+		.device_id	= PCI_DEVICE_ID_DDA08_16,
+		.ao_chans	= 8,
+		.ao_bits	= 16,
+	},
 };
 
 struct cb_pcidda_private {