---

yaml --- r: 317072 b: refs/heads/master c: 85a15d5 h: refs/heads/master v: v3
git-mirror · Jun 5, 2012 · b5adb0b · b5adb0b
1 parent 1e7c23d
commit b5adb0b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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;