From 98f5c4858a9c24ddbfc0c373ae52e851264bff0a Mon Sep 17 00:00:00 2001
From: H Hartley Sweeten <hartleys@visionengravers.com>
Date: Tue, 13 Nov 2012 13:47:48 -0700
Subject: [PATCH] --- yaml --- r: 337887 b: refs/heads/master c:
 1567ceaa3f0e4207fcce46e5116752c9e2d8e294 h: refs/heads/master i:   337885:
 dfb6a78f1b576c0081a26bd4f4389b10327ef267   337883:
 3d34fa6046e473e0d5fbb3bb95347a077a00bb2d   337879:
 16a3b6701b6f8055c953d273affc85d12b6f5bad   337871:
 3148a22283c14d68001c3f98e9350a970e861f28   337855:
 f7a238b37d0d6d15d4b9ab82abf5aa880edc4b45 v: v3

---
 [refs]                                        |  2 +-
 .../staging/comedi/drivers/addi_apci_1516.c   | 22 ++++++++++---------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 0cde019699e6..bd26006d0b86 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0ff1fa77687052ff36aa141317c45f737057ce5d
+refs/heads/master: 1567ceaa3f0e4207fcce46e5116752c9e2d8e294
diff --git a/trunk/drivers/staging/comedi/drivers/addi_apci_1516.c b/trunk/drivers/staging/comedi/drivers/addi_apci_1516.c
index e3e4b0f0f5b0..5f8d802fa788 100644
--- a/trunk/drivers/staging/comedi/drivers/addi_apci_1516.c
+++ b/trunk/drivers/staging/comedi/drivers/addi_apci_1516.c
@@ -40,20 +40,22 @@
 #define PCI_DEVICE_ID_APCI2016		0x1002
 
 /*
- * PCI bar 1 I/O Register map
+ * PCI bar 1 I/O Register map - Digital input/output
  */
-#define APCI1516_DI_REG				0x00
-#define APCI1516_DO_REG				0x04
+#define APCI1516_DI_REG			0x00
+#define APCI1516_DO_REG			0x04
 
 /*
- * PCI bar 2 I/O Register map
+ * PCI bar 2 I/O Register map - Watchdog (APCI-1516 and APCI-2016)
  */
-#define APCI1516_WDOG_REG			0x00
-#define APCI1516_WDOG_RELOAD_REG		0x04
-#define APCI1516_WDOG_CTRL_REG			0x0c
-#define APCI1516_WDOG_CTRL_ENABLE		(1 << 0)
-#define APCI1516_WDOG_CTRL_SW_TRIG		(1 << 9)
-#define APCI1516_WDOG_STATUS_REG		0x10
+#define APCI1516_WDOG_REG		0x00
+#define APCI1516_WDOG_RELOAD_REG	0x04
+#define APCI1516_WDOG_CTRL_REG		0x0c
+#define APCI1516_WDOG_CTRL_ENABLE	(1 << 0)
+#define APCI1516_WDOG_CTRL_SW_TRIG	(1 << 9)
+#define APCI1516_WDOG_STATUS_REG	0x10
+#define APCI1516_WDOG_STATUS_ENABLED	(1 << 0)
+#define APCI1516_WDOG_STATUS_SW_TRIG	(1 << 1)
 
 struct apci1516_boardinfo {
 	const char *name;