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 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/mchehab...
[cascardo/linux.git]
/
include
/
linux
/
mtd
/
map.h
diff --git
a/include/linux/mtd/map.h
b/include/linux/mtd/map.h
index
28d461d
..
81f3a31
100644
(file)
--- a/
include/linux/mtd/map.h
+++ b/
include/linux/mtd/map.h
@@
-183,7
+183,7
@@
typedef union {
struct map_info {
char *name;
unsigned long size;
-
unsigned long
phys;
+
resource_size_t
phys;
#define NO_XIP (-1UL)
void __iomem *virt;