From b8147cc476320b242d03c3dadb0efd295b8c7e17 Mon Sep 17 00:00:00 2001
From: H Hartley Sweeten <hartleys@visionengravers.com>
Date: Mon, 21 May 2012 18:21:39 -0700
Subject: [PATCH] --- yaml --- r: 317076 b: refs/heads/master c:
 42caa910f286e2be0763a6fb8aa7a998e10c6e02 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 820abb044148..87fdd1b3337c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4aa7419e082ef5ca38f8934d38fda5909a27962b
+refs/heads/master: 42caa910f286e2be0763a6fb8aa7a998e10c6e02
diff --git a/trunk/drivers/staging/comedi/drivers/s626.c b/trunk/drivers/staging/comedi/drivers/s626.c
index 516037009dcd..d6dc3381205a 100644
--- a/trunk/drivers/staging/comedi/drivers/s626.c
+++ b/trunk/drivers/staging/comedi/drivers/s626.c
@@ -118,7 +118,7 @@ static const struct s626_board s626_boards[] = {
 
 struct s626_private {
 	struct pci_dev *pdev;
-	void *base_addr;
+	void __iomem *base_addr;
 	int got_regions;
 	short allocatedBuf;
 	uint8_t ai_cmd_running;	/*  ai_cmd is running */