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];
 };