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 {