---

yaml --- r: 317074 b: refs/heads/master c: 86a5eb8 h: refs/heads/master v: v3
git-mirror · Jun 5, 2012 · c37d6a2 · c37d6a2
1 parent 3556bf6
commit c37d6a2
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: ff450314d5ef05843d3b3bd33fc65f7aaea3b2df
+refs/heads/master: 86a5eb8ccef09916e622b43f97f115c2526d7d2e
diff --git a/trunk/drivers/staging/comedi/drivers/icp_multi.c b/trunk/drivers/staging/comedi/drivers/icp_multi.c
@@ -148,7 +148,7 @@ struct boardtype {
 struct icp_multi_private {
 	struct pcilst_struct *card;	/*  pointer to card */
 	char valid;		/*  card is usable */
-	void *io_addr;		/*  Pointer to mapped io address */
+	void __iomem *io_addr;		/*  Pointer to mapped io address */
 	resource_size_t phys_iobase;	/*  Physical io address */
 	unsigned int AdcCmdStatus;	/*  ADC Command/Status register */
 	unsigned int DacCmdStatus;	/*  DAC Command/Status register */