---

yaml --- r: 197243 b: refs/heads/master c: b74a967 h: refs/heads/master i: 197241: eccb489 197239: 6fa91f8 v: v3
git-mirror · May 11, 2010 · 661fcf1 · 661fcf1
1 parent 8de3c75
commit 661fcf1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e3752a1dfd8a003139dee2c80de3d915534e2b39
+refs/heads/master: b74a9670857c2af74e36ecbd31bbc55ddd8e1311
diff --git a/trunk/drivers/staging/comedi/drivers/plx9080.h b/trunk/drivers/staging/comedi/drivers/plx9080.h
@@ -380,9 +380,9 @@ enum bigend_bits {
 #define MBX_ADDR_SPACE_360 0x80	/* wanXL100s/200/400 */
 #define MBX_ADDR_MASK_360 (MBX_ADDR_SPACE_360-1)
 
-static inline int plx9080_abort_dma(void *iobase, unsigned int channel)
+static inline int plx9080_abort_dma(void __iomem *iobase, unsigned int channel)
 {
-	void *dma_cs_addr;
+	void __iomem *dma_cs_addr;
 	uint8_t dma_status;
 	const int timeout = 10000;
 	unsigned int i;