diff options
author | Paul Bolle <pebolle@tiscali.nl> | 2014-05-23 10:29:54 -0400 |
---|---|---|
committer | Brian Norris <computersforpeace@gmail.com> | 2014-05-28 18:12:47 -0400 |
commit | 390e9eacf1dcece3cee8fb4d95edbfea90574e91 (patch) | |
tree | efb206aca452476c55db67bac0c589f44316d54d /drivers/mtd | |
parent | 0c53be9de8f25efadee707132a596276f0a015e4 (diff) |
mtd: maps: remove check for CONFIG_MTD_SUPERH_RESERVE
Since (a few releases before) v2.6.0 there have been checks for
CONFIG_MTD_SUPERH_RESERVE. One check is still present. But a Kconfig
symbol MTD_SUPERH_RESERVE has never been added. So a few lines of dead
code can be removed.
Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Diffstat (limited to 'drivers/mtd')
-rw-r--r-- | drivers/mtd/maps/solutionengine.c | 25 |
1 files changed, 1 insertions, 24 deletions
diff --git a/drivers/mtd/maps/solutionengine.c b/drivers/mtd/maps/solutionengine.c index 83a7a7091562..bb580bc16445 100644 --- a/drivers/mtd/maps/solutionengine.c +++ b/drivers/mtd/maps/solutionengine.c | |||
@@ -33,28 +33,6 @@ struct map_info soleng_flash_map = { | |||
33 | 33 | ||
34 | static const char * const probes[] = { "RedBoot", "cmdlinepart", NULL }; | 34 | static const char * const probes[] = { "RedBoot", "cmdlinepart", NULL }; |
35 | 35 | ||
36 | #ifdef CONFIG_MTD_SUPERH_RESERVE | ||
37 | static struct mtd_partition superh_se_partitions[] = { | ||
38 | /* Reserved for boot code, read-only */ | ||
39 | { | ||
40 | .name = "flash_boot", | ||
41 | .offset = 0x00000000, | ||
42 | .size = CONFIG_MTD_SUPERH_RESERVE, | ||
43 | .mask_flags = MTD_WRITEABLE, | ||
44 | }, | ||
45 | /* All else is writable (e.g. JFFS) */ | ||
46 | { | ||
47 | .name = "Flash FS", | ||
48 | .offset = MTDPART_OFS_NXTBLK, | ||
49 | .size = MTDPART_SIZ_FULL, | ||
50 | } | ||
51 | }; | ||
52 | #define NUM_PARTITIONS ARRAY_SIZE(superh_se_partitions) | ||
53 | #else | ||
54 | #define superh_se_partitions NULL | ||
55 | #define NUM_PARTITIONS 0 | ||
56 | #endif /* CONFIG_MTD_SUPERH_RESERVE */ | ||
57 | |||
58 | static int __init init_soleng_maps(void) | 36 | static int __init init_soleng_maps(void) |
59 | { | 37 | { |
60 | /* First probe at offset 0 */ | 38 | /* First probe at offset 0 */ |
@@ -92,8 +70,7 @@ static int __init init_soleng_maps(void) | |||
92 | mtd_device_register(eprom_mtd, NULL, 0); | 70 | mtd_device_register(eprom_mtd, NULL, 0); |
93 | } | 71 | } |
94 | 72 | ||
95 | mtd_device_parse_register(flash_mtd, probes, NULL, | 73 | mtd_device_parse_register(flash_mtd, probes, NULL, NULL, 0); |
96 | superh_se_partitions, NUM_PARTITIONS); | ||
97 | 74 | ||
98 | return 0; | 75 | return 0; |
99 | } | 76 | } |