From 43986769e9ccd25909074736fddac700ab00fd02 Mon Sep 17 00:00:00 2001
From: H Hartley Sweeten <hartleys@visionengravers.com>
Date: Wed, 24 Oct 2012 16:33:13 -0700
Subject: [PATCH] --- yaml --- r: 337263 b: refs/heads/master c:
 c8ffd143fac826787eb948930982902b5f0a778d h: refs/heads/master i:   337261:
 0d77ed3d553ef285b4c5d8615dd74d7b67cca384   337259:
 4ec690f555dd74ac09e593cc58b7e0373e327f31   337255:
 0e44e8b2fb2a13d4a6385aa32f59c00f87b44d9b   337247:
 bbb696d58acfaf0d8e55ea2be954493c41ee9f40 v: v3

---
 [refs]                                          |  2 +-
 .../drivers/staging/comedi/drivers/cb_pcidda.c  | 17 ++---------------
 2 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/[refs] b/[refs]
index aba523e1cc7f..a4d4c43d66e4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0963fa1c83474557e6e868fbe56ddd53c99fb929
+refs/heads/master: c8ffd143fac826787eb948930982902b5f0a778d
diff --git a/trunk/drivers/staging/comedi/drivers/cb_pcidda.c b/trunk/drivers/staging/comedi/drivers/cb_pcidda.c
index f1aa9c943157..2e2d00a60c95 100644
--- a/trunk/drivers/staging/comedi/drivers/cb_pcidda.c
+++ b/trunk/drivers/staging/comedi/drivers/cb_pcidda.c
@@ -61,21 +61,8 @@
 #define MAX_AO_CHANNELS 8
 
 /* Digital I/O registers */
-#define PORT1A 0		/*  PORT 1A DATA */
-
-#define PORT1B 1		/*  PORT 1B DATA */
-
-#define PORT1C 2		/*  PORT 1C DATA */
-
-#define CONTROL1 3		/*  CONTROL REGISTER 1 */
-
-#define PORT2A 4		/*  PORT 2A DATA */
-
-#define PORT2B 5		/*  PORT 2B DATA */
-
-#define PORT2C 6		/*  PORT 2C DATA */
-
-#define CONTROL2 7		/*  CONTROL REGISTER 2 */
+#define CB_DDA_DIO0_8255_BASE		0x00
+#define CB_DDA_DIO1_8255_BASE		0x04
 
 /* DAC registers */
 #define DACONTROL	0	/*  D/A CONTROL REGISTER */