From b5adb0b8f6763e6993a48681f8322141d52231d1 Mon Sep 17 00:00:00 2001
From: H Hartley Sweeten <hartleys@visionengravers.com>
Date: Mon, 21 May 2012 17:43:31 -0700
Subject: [PATCH] --- yaml --- r: 317072 b: refs/heads/master c:
 85a15d5bcab6dbae638fb51e2bc93217c7c3b23c h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 2b47508c8950..5c9d22c06099 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 55c03cff7fd73349473cc0a964df9d55b312dbbc
+refs/heads/master: 85a15d5bcab6dbae638fb51e2bc93217c7c3b23c
diff --git a/trunk/drivers/staging/comedi/drivers/dt3000.c b/trunk/drivers/staging/comedi/drivers/dt3000.c
index 2c1c6140f38f..af0202474127 100644
--- a/trunk/drivers/staging/comedi/drivers/dt3000.c
+++ b/trunk/drivers/staging/comedi/drivers/dt3000.c
@@ -252,7 +252,7 @@ struct dt3k_private {
 
 	struct pci_dev *pci_dev;
 	resource_size_t phys_addr;
-	void *io_addr;
+	void __iomem *io_addr;
 	unsigned int lock;
 	unsigned int ao_readback[2];
 	unsigned int ai_front;