diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2008-07-02 12:46:22 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-07-21 21:55:03 -0700 |
commit | eadcf0d704a46979c29984fa05f1fc413c775bcb (patch) | |
tree | 79d417f4d98321929bde702fe1ff7f13ed27f465 /include | |
parent | 89bcb05d9bbf8bd559988bca4f2579defd28d008 (diff) | |
download | linux-eadcf0d704a46979c29984fa05f1fc413c775bcb.tar.gz linux-eadcf0d704a46979c29984fa05f1fc413c775bcb.tar.bz2 linux-eadcf0d704a46979c29984fa05f1fc413c775bcb.zip |
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 { */ struct map_info { - char *name; + const char *name; unsigned long size; resource_size_t phys; #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 { u_int32_t oobavail; // Available OOB bytes per block // Kernel-only stuff starts here. - char *name; + const char *name; int index; /* ecc layout structure pointer - read only ! */ |