From 8c2dae21821a397437128e91924295c20075a5c8 Mon Sep 17 00:00:00 2001
From: H Hartley Sweeten <hsweeten@visionengravers.com>
Date: Tue, 5 Mar 2013 10:15:40 -0700
Subject: [PATCH] --- yaml --- r: 363392 b: refs/heads/master c:
 e4f0e1302908488fd2761a76d2d8cbddc1d291a7 h: refs/heads/master v: v3

---
 [refs]                                        |   2 +-
 .../drivers/staging/comedi/drivers/ni_65xx.c  | 159 ++++++++++--------
 2 files changed, 88 insertions(+), 73 deletions(-)

diff --git a/[refs] b/[refs]
index f0a1ff7cebdc..3f1d6a330366 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8f5d4e0385c160a7442b9288f4ac2fbc8d44fe6e
+refs/heads/master: e4f0e1302908488fd2761a76d2d8cbddc1d291a7
diff --git a/trunk/drivers/staging/comedi/drivers/ni_65xx.c b/trunk/drivers/staging/comedi/drivers/ni_65xx.c
index 9d824c59123a..74a1e65010cf 100644
--- a/trunk/drivers/staging/comedi/drivers/ni_65xx.c
+++ b/trunk/drivers/staging/comedi/drivers/ni_65xx.c
@@ -147,99 +147,114 @@ struct ni_65xx_board {
 
 static const struct ni_65xx_board ni_65xx_boards[] = {
 	[BOARD_PCI6509] = {
-	 .name = "pci-6509",
-	 .num_dio_ports = 12,
-	 .invert_outputs = 0},
+		.name		= "pci-6509",
+		.num_dio_ports	= 12,
+	},
 	[BOARD_PXI6509] = {
-	 .name = "pxi-6509",
-	 .num_dio_ports = 12,
-	 .invert_outputs = 0},
+		.name		= "pxi-6509",
+		.num_dio_ports	= 12,
+	},
 	[BOARD_PCI6510] = {
-	 .name = "pci-6510",
-	 .num_di_ports = 4},
+		.name		= "pci-6510",
+		.num_di_ports	= 4,
+	},
 	[BOARD_PCI6511] = {
-	 .name = "pci-6511",
-	 .num_di_ports = 8},
+		.name		= "pci-6511",
+		.num_di_ports	= 8,
+	},
 	[BOARD_PXI6511] = {
-	 .name = "pxi-6511",
-	 .num_di_ports = 8},
+		.name		= "pxi-6511",
+		.num_di_ports	= 8,
+	},
 	[BOARD_PCI6512] = {
-	 .name = "pci-6512",
-	 .num_do_ports = 8},
+		.name		= "pci-6512",
+		.num_do_ports	= 8,
+	},
 	[BOARD_PXI6512] = {
-	 .name = "pxi-6512",
-	 .num_do_ports = 8},
+		.name		= "pxi-6512",
+		.num_do_ports	= 8,
+	},
 	[BOARD_PCI6513] = {
-	 .name = "pci-6513",
-	 .num_do_ports = 8,
-	 .invert_outputs = 1},
+		.name		= "pci-6513",
+		.num_do_ports	= 8,
+		.invert_outputs	= 1,
+	},
 	[BOARD_PXI6513] = {
-	 .name = "pxi-6513",
-	 .num_do_ports = 8,
-	 .invert_outputs = 1},
+		.name		= "pxi-6513",
+		.num_do_ports	= 8,
+		.invert_outputs	= 1,
+	},
 	[BOARD_PCI6514] = {
-	 .name = "pci-6514",
-	 .num_di_ports = 4,
-	 .num_do_ports = 4,
-	 .invert_outputs = 1},
+		.name		= "pci-6514",
+		.num_di_ports	= 4,
+		.num_do_ports	= 4,
+		.invert_outputs	= 1,
+	},
 	[BOARD_PXI6514] = {
-	 .name = "pxi-6514",
-	 .num_di_ports = 4,
-	 .num_do_ports = 4,
-	 .invert_outputs = 1},
+		.name		= "pxi-6514",
+		.num_di_ports	= 4,
+		.num_do_ports	= 4,
+		.invert_outputs	= 1,
+	},
 	[BOARD_PCI6515] = {
-	 .name = "pci-6515",
-	 .num_di_ports = 4,
-	 .num_do_ports = 4,
-	 .invert_outputs = 1},
+		.name		= "pci-6515",
+		.num_di_ports	= 4,
+		.num_do_ports	= 4,
+		.invert_outputs	= 1,
+	},
 	[BOARD_PXI6515] = {
-	 .name = "pxi-6515",
-	 .num_di_ports = 4,
-	 .num_do_ports = 4,
-	 .invert_outputs = 1},
+		.name		= "pxi-6515",
+		.num_di_ports	= 4,
+		.num_do_ports	= 4,
+		.invert_outputs	= 1,
+	},
 	[BOARD_PCI6516] = {
-	 .name = "pci-6516",
-	 .num_do_ports = 4,
-	 .invert_outputs = 1},
+		.name		= "pci-6516",
+		.num_do_ports	= 4,
+		.invert_outputs	= 1,
+	},
 	[BOARD_PCI6517] = {
-	 .name = "pci-6517",
-	 .num_do_ports = 4,
-	 .invert_outputs = 1},
+		.name		= "pci-6517",
+		.num_do_ports	= 4,
+		.invert_outputs	= 1,
+	},
 	[BOARD_PCI6518] = {
-	 .name = "pci-6518",
-	 .num_di_ports = 2,
-	 .num_do_ports = 2,
-	 .invert_outputs = 1},
+		.name		= "pci-6518",
+		.num_di_ports	= 2,
+		.num_do_ports	= 2,
+		.invert_outputs	= 1,
+	},
 	[BOARD_PCI6519] = {
-	 .name = "pci-6519",
-	 .num_di_ports = 2,
-	 .num_do_ports = 2,
-	 .invert_outputs = 1},
+		.name		= "pci-6519",
+		.num_di_ports	= 2,
+		.num_do_ports	= 2,
+		.invert_outputs	= 1,
+	},
 	[BOARD_PCI6520] = {
-	 .name = "pci-6520",
-	 .num_di_ports = 1,
-	 .num_do_ports = 1,
-	 },
+		.name		= "pci-6520",
+		.num_di_ports	= 1,
+		.num_do_ports	= 1,
+	},
 	[BOARD_PCI6521] = {
-	 .name = "pci-6521",
-	 .num_di_ports = 1,
-	 .num_do_ports = 1,
-	 },
+		.name		= "pci-6521",
+		.num_di_ports	= 1,
+		.num_do_ports	= 1,
+	},
 	[BOARD_PXI6521] = {
-	 .name = "pxi-6521",
-	 .num_di_ports = 1,
-	 .num_do_ports = 1,
-	 },
+		.name		= "pxi-6521",
+		.num_di_ports	= 1,
+		.num_do_ports	= 1,
+	},
 	[BOARD_PCI6528] = {
-	 .name = "pci-6528",
-	 .num_di_ports = 3,
-	 .num_do_ports = 3,
-	 },
+		.name		= "pci-6528",
+		.num_di_ports	= 3,
+		.num_do_ports	= 3,
+	},
 	[BOARD_PXI6528] = {
-	 .name = "pxi-6528",
-	 .num_di_ports = 3,
-	 .num_do_ports = 3,
-	 },
+		.name		= "pxi-6528",
+		.num_di_ports	= 3,
+		.num_do_ports	= 3,
+	},
 };
 
 static inline unsigned ni_65xx_port_by_channel(unsigned channel)