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/mtd.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/mtd.h')
| -rw-r--r-- | include/linux/mtd/mtd.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/mtd/mtd.h b/include/linux/mtd/mtd.h index 31ed234b2a7..4ed40caff4e 100644 --- a/include/linux/mtd/mtd.h +++ b/include/linux/mtd/mtd.h | |||
| @@ -119,7 +119,7 @@ struct mtd_info { | |||
| 119 | u_int32_t oobavail; // Available OOB bytes per block | 119 | u_int32_t oobavail; // Available OOB bytes per block |
| 120 | 120 | ||
| 121 | // Kernel-only stuff starts here. | 121 | // Kernel-only stuff starts here. |
| 122 | char *name; | 122 | const char *name; |
| 123 | int index; | 123 | int index; |
| 124 | 124 | ||
| 125 | /* ecc layout structure pointer - read only ! */ | 125 | /* ecc layout structure pointer - read only ! */ |