From d82346414595e0e0b1bbcb2f52f43e372e9bb89d Mon Sep 17 00:00:00 2001
From: "Emilio G. Cota" <cota@braap.org>
Date: Fri, 12 Nov 2010 11:15:40 +0000
Subject: [PATCH] --- yaml --- r: 228107 b: refs/heads/master c:
 0599726793d6dca6bd171cd4e497f9aac21e8f0c h: refs/heads/master i:   228105:
 586a5c514f216143b6c5ca86473261c01bf0b681   228103:
 a5bec1b9fab4b2238e97b0e74b3e65a8275095e9 v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/staging/vme/vme_bridge.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 8fbceccab3d0..6fb17fc7fdcd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1a85f2073d99080ea70962f767edca479c768b6e
+refs/heads/master: 0599726793d6dca6bd171cd4e497f9aac21e8f0c
diff --git a/trunk/drivers/staging/vme/vme_bridge.h b/trunk/drivers/staging/vme/vme_bridge.h
index b653ec02e1fc..4c6ec31b01db 100644
--- a/trunk/drivers/staging/vme/vme_bridge.h
+++ b/trunk/drivers/staging/vme/vme_bridge.h
@@ -20,7 +20,7 @@ struct vme_master_resource {
 	vme_cycle_t cycle_attr;
 	vme_width_t width_attr;
 	struct resource bus_resource;
-	void *kern_base;
+	void __iomem *kern_base;
 };
 
 struct vme_slave_resource {