diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2008-07-25 10:40:14 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2008-07-25 10:40:14 -0400 |
| commit | ff877ea80efa2015b6263766f78ee42c2a1b32f9 (patch) | |
| tree | 85205005c611ab774702148558321c6fb92f1ccd /include/linux/mtd/map.h | |
| parent | 30821fee4f0cb3e6d241d9f7ddc37742212e3eb7 (diff) | |
| parent | d37e6bf68fc1eb34a4ad21d9ae8890ed37ea80e7 (diff) | |
Merge branch 'linux-next' of git://git.infradead.org/~dedekind/ubi-2.6
Diffstat (limited to 'include/linux/mtd/map.h')
| -rw-r--r-- | include/linux/mtd/map.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/mtd/map.h b/include/linux/mtd/map.h index 85e3939cf487..aa30244492c6 100644 --- a/include/linux/mtd/map.h +++ b/include/linux/mtd/map.h | |||
| @@ -188,7 +188,7 @@ typedef union { | |||
| 188 | */ | 188 | */ |
| 189 | 189 | ||
| 190 | struct map_info { | 190 | struct map_info { |
| 191 | char *name; | 191 | const char *name; |
| 192 | unsigned long size; | 192 | unsigned long size; |
| 193 | resource_size_t phys; | 193 | resource_size_t phys; |
| 194 | #define NO_XIP (-1UL) | 194 | #define NO_XIP (-1UL) |