projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg...
[cascardo/linux.git]
/
drivers
/
staging
/
vme
/
vme_bridge.h
diff --git
a/drivers/staging/vme/vme_bridge.h
b/drivers/staging/vme/vme_bridge.h
index
b653ec0
..
4c6ec31
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 {