diff options
author | Niklas Cassel <niklas.cassel@axis.com> | 2016-06-10 12:21:20 -0400 |
---|---|---|
committer | Jesper Nilsson <jespern@axis.com> | 2016-09-23 09:27:57 -0400 |
commit | 0e1847c4b1592fcb1e66f1e427105d2ff8781271 (patch) | |
tree | 409043ffb3b3ed53b6ef390ba4d399191bcb6cc5 | |
parent | 4c241d3c7bd628df7e84712046e9c130d48cae21 (diff) |
cris: v10: axisflashmap: remove unused ifdefs
The Kconfig CONFIG_ETRAX_AXISFLASHMAP_MTD0WHOLE
does not exist for crisv10, so remove it.
Signed-off-by: Niklas Cassel <niklas.cassel@axis.com>
Signed-off-by: Jesper Nilsson <jespern@axis.com>
-rw-r--r-- | arch/cris/arch-v10/drivers/axisflashmap.c | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/arch/cris/arch-v10/drivers/axisflashmap.c b/arch/cris/arch-v10/drivers/axisflashmap.c index bdc25aa43468..28292da49664 100644 --- a/arch/cris/arch-v10/drivers/axisflashmap.c +++ b/arch/cris/arch-v10/drivers/axisflashmap.c | |||
@@ -177,15 +177,6 @@ static struct mtd_partition axis_partitions[MAX_PARTITIONS] = { | |||
177 | }, | 177 | }, |
178 | }; | 178 | }; |
179 | 179 | ||
180 | #ifdef CONFIG_ETRAX_AXISFLASHMAP_MTD0WHOLE | ||
181 | /* Main flash device */ | ||
182 | static struct mtd_partition main_partition = { | ||
183 | .name = "main", | ||
184 | .size = 0, | ||
185 | .offset = 0 | ||
186 | }; | ||
187 | #endif | ||
188 | |||
189 | /* | 180 | /* |
190 | * Probe a chip select for AMD-compatible (JEDEC) or CFI-compatible flash | 181 | * Probe a chip select for AMD-compatible (JEDEC) or CFI-compatible flash |
191 | * chips in that order (because the amd_flash-driver is faster). | 182 | * chips in that order (because the amd_flash-driver is faster). |
@@ -369,16 +360,6 @@ static int __init init_axis_flash(void) | |||
369 | pidx++; | 360 | pidx++; |
370 | } | 361 | } |
371 | 362 | ||
372 | #ifdef CONFIG_ETRAX_AXISFLASHMAP_MTD0WHOLE | ||
373 | if (mymtd) { | ||
374 | main_partition.size = mymtd->size; | ||
375 | err = mtd_device_register(mymtd, &main_partition, 1); | ||
376 | if (err) | ||
377 | panic("axisflashmap: Could not initialize " | ||
378 | "partition for whole main mtd device!\n"); | ||
379 | } | ||
380 | #endif | ||
381 | |||
382 | if (mymtd) { | 363 | if (mymtd) { |
383 | if (use_default_ptable) { | 364 | if (use_default_ptable) { |
384 | printk(KERN_INFO " Using default partition table.\n"); | 365 | printk(KERN_INFO " Using default partition table.\n"); |