diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2008-07-02 15:46:22 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-07-22 00:55:03 -0400 |
commit | eadcf0d704a46979c29984fa05f1fc413c775bcb (patch) | |
tree | 79d417f4d98321929bde702fe1ff7f13ed27f465 /include | |
parent | 89bcb05d9bbf8bd559988bca4f2579defd28d008 (diff) |
MTD: handle pci_name() being const
This changes the MTD core to handle pci_name() now returning a constant
string.
Cc: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/mtd/map.h | 2 | ||||
-rw-r--r-- | include/linux/mtd/mtd.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/mtd/map.h b/include/linux/mtd/map.h index a9fae032ba81..9c1d95491f8b 100644 --- a/include/linux/mtd/map.h +++ b/include/linux/mtd/map.h | |||
@@ -189,7 +189,7 @@ typedef union { | |||
189 | */ | 189 | */ |
190 | 190 | ||
191 | struct map_info { | 191 | struct map_info { |
192 | char *name; | 192 | const char *name; |
193 | unsigned long size; | 193 | unsigned long size; |
194 | resource_size_t phys; | 194 | resource_size_t phys; |
195 | #define NO_XIP (-1UL) | 195 | #define NO_XIP (-1UL) |
diff --git a/include/linux/mtd/mtd.h b/include/linux/mtd/mtd.h index 245f9098e171..8b5d49133ec6 100644 --- a/include/linux/mtd/mtd.h +++ b/include/linux/mtd/mtd.h | |||
@@ -121,7 +121,7 @@ struct mtd_info { | |||
121 | u_int32_t oobavail; // Available OOB bytes per block | 121 | u_int32_t oobavail; // Available OOB bytes per block |
122 | 122 | ||
123 | // Kernel-only stuff starts here. | 123 | // Kernel-only stuff starts here. |
124 | char *name; | 124 | const char *name; |
125 | int index; | 125 | int index; |
126 | 126 | ||
127 | /* ecc layout structure pointer - read only ! */ | 127 | /* ecc layout structure pointer - read only ! */ |