Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / staging / vme / vme_bridge.h

diff --git a/drivers/staging/vme/vme_bridge.h b/drivers/staging/vme/vme_bridge.h
index b653ec02e1fc4d87bf90578090f5564033c808f3..4c6ec31b01db5c27859f56f13e234087c7f2b1e8 100644 (file)
--- a/drivers/staging/vme/vme_bridge.h
+++ b/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 {