diff options
Diffstat (limited to 'drivers/mtd')
-rw-r--r-- | drivers/mtd/maps/physmap.c | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/drivers/mtd/maps/physmap.c b/drivers/mtd/maps/physmap.c index 21b0b713cacb..e7a592c8c765 100644 --- a/drivers/mtd/maps/physmap.c +++ b/drivers/mtd/maps/physmap.c | |||
@@ -87,21 +87,18 @@ static void physmap_set_vpp(struct map_info *map, int state) | |||
87 | spin_unlock_irqrestore(&info->vpp_lock, flags); | 87 | spin_unlock_irqrestore(&info->vpp_lock, flags); |
88 | } | 88 | } |
89 | 89 | ||
90 | static const char *rom_probe_types[] = { | 90 | static const char * const rom_probe_types[] = { |
91 | "cfi_probe", | 91 | "cfi_probe", "jedec_probe", "qinfo_probe", "map_rom", NULL }; |
92 | "jedec_probe", | 92 | |
93 | "qinfo_probe", | 93 | static const char * const part_probe_types[] = { |
94 | "map_rom", | 94 | "cmdlinepart", "RedBoot", "afs", NULL }; |
95 | NULL }; | ||
96 | static const char *part_probe_types[] = { "cmdlinepart", "RedBoot", "afs", | ||
97 | NULL }; | ||
98 | 95 | ||
99 | static int physmap_flash_probe(struct platform_device *dev) | 96 | static int physmap_flash_probe(struct platform_device *dev) |
100 | { | 97 | { |
101 | struct physmap_flash_data *physmap_data; | 98 | struct physmap_flash_data *physmap_data; |
102 | struct physmap_flash_info *info; | 99 | struct physmap_flash_info *info; |
103 | const char **probe_type; | 100 | const char * const *probe_type; |
104 | const char **part_types; | 101 | const char * const *part_types; |
105 | int err = 0; | 102 | int err = 0; |
106 | int i; | 103 | int i; |
107 | int devices_found = 0; | 104 | int devices_found = 0; |