From 75f27d3cd716eeb28dd63bc1aae50f197f788407 Mon Sep 17 00:00:00 2001
From: H Hartley Sweeten <hartleys@visionengravers.com>
Date: Wed, 18 Jul 2012 18:57:28 -0700
Subject: [PATCH] --- yaml --- r: 318107 b: refs/heads/master c:
 d73805ceb1cf7fd86863de25a8038e5c1651172e h: refs/heads/master i:   318105:
 37e0e198f690fa6ee44bce91ec7e0e648b71cb4e   318103:
 d138b94bc1d2ed36fcd457f5be3629ba7d67a975 v: v3

---
 [refs]                                              | 2 +-
 trunk/drivers/staging/comedi/drivers/daqboard2000.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index adc84a3e9f3a..b16fd77c7729 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ad196be73d4c5fd433cec22a306dcbab3fc7e25c
+refs/heads/master: d73805ceb1cf7fd86863de25a8038e5c1651172e
diff --git a/trunk/drivers/staging/comedi/drivers/daqboard2000.c b/trunk/drivers/staging/comedi/drivers/daqboard2000.c
index ba61e328fd29..ef28385c1482 100644
--- a/trunk/drivers/staging/comedi/drivers/daqboard2000.c
+++ b/trunk/drivers/staging/comedi/drivers/daqboard2000.c
@@ -318,7 +318,7 @@ struct daqboard2000_private {
 		card_daqboard_2000
 	} card;
 	void *daq;
-	void *plx;
+	void __iomem *plx;
 	unsigned int ao_readback[2];
 };